Browse Source

排产计划上传优化

callm 2 months ago
parent
commit
746c03c834
2 changed files with 18 additions and 18 deletions
  1. 2 2
      FileWatcher/Program.cs
  2. 16 16
      FileWatcher/UploadMakePlan.cs

+ 2 - 2
FileWatcher/Program.cs

@@ -46,8 +46,8 @@ namespace FileWatcher
                 Application.SetCompatibleTextRenderingDefault(false);
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 {
-                    //Application.Run(new UploadMakePlan());
-                    Application.Run(new AutoMakeQTYRZ());
+                    Application.Run(new UploadMakePlan());
+                    //Application.Run(new AutoMakeQTYRZ());
                     //Application.Run(new AutoAnalysisXmlByStep());
                     //Application.Run(new SOP_PNE("", ""));
                     //Application.Run(new AutoMakeQTY());

+ 16 - 16
FileWatcher/UploadMakePlan.cs

@@ -158,22 +158,22 @@ namespace FileWatcher
                                             OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "' 工作中心'" + wccode + "' 重复");
                                             return;
                                         }
-                                        //销售订单+订单序号存在ERP中,才允许上传
-                                        //if (!dh.CheckExist("saledetail@ERP left join sale@ERP on sa_id=sd_said", "SD_DETNO='" + orderdetno + "' and sa_code='" + ordercode + "'"))
-                                        //{
-                                        //    OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在");
-                                        //    return;
-                                        //}
-                                        //dt = (System.Data.DataTable)dh.ExecuteSql("select * from saledetail@ERP left join sale@ERP on sa_id=sd_said left join " +
-                                        //    "(select min(mpd_outqty)mpd_outqty, mpd_ordercode,mpd_orderdetno  from(select mpd_stepcode,nvl(sum(mpd_outqty),0)mpd_outqty, " +
-                                        //    "mpd_ordercode, mpd_orderdetno from MakePlanDetail where mpd_wccode='" + wccode + "' and nvl(mpd_stepcode,' ')='" + stepcode + "' group by mpd_ordercode, mpd_orderdetno,mpd_stepcode)group " +
-                                        //    "by mpd_ordercode, mpd_orderdetno,mpd_stepcode) on sa_code = mpd_ordercode and sd_detno =mpd_orderdetno " +
-                                        //    "where sd_qty<nvl(mpd_outqty,0)+" + planqty + " and sa_code='" + ordercode + "' and sd_detno='" + orderdetno + "'", "select");
-                                        //if (dt.Rows.Count > 0)
-                                        //{
-                                        //    OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'工序" + stepcode + "累计排产数量超出");
-                                        //    return;
-                                        //}
+                                        //销售订单 + 订单序号存在ERP中,才允许上传
+                                        if (!dh.CheckExist("saledetail@ERP left join sale@ERP on sa_id=sd_said", "SD_DETNO='" + orderdetno + "' and sa_code='" + ordercode + "'"))
+                                        {
+                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在");
+                                            return;
+                                        }
+                                        dt = (System.Data.DataTable)dh.ExecuteSql("select * from saledetail@ERP left join sale@ERP on sa_id=sd_said left join " +
+                                            "(select min(mpd_outqty)mpd_outqty, mpd_ordercode,mpd_orderdetno  from(select mpd_stepcode,nvl(sum(mpd_outqty),0)mpd_outqty, " +
+                                            "mpd_ordercode, mpd_orderdetno from MakePlanDetail where mpd_wccode='" + wccode + "' and nvl(mpd_stepcode,' ')='" + stepcode + "' group by mpd_ordercode, mpd_orderdetno,mpd_stepcode)group " +
+                                            "by mpd_ordercode, mpd_orderdetno,mpd_stepcode) on sa_code = mpd_ordercode and sd_detno =mpd_orderdetno " +
+                                            "where sd_qty<nvl(mpd_outqty,0)+" + planqty + " and sa_code='" + ordercode + "' and sd_detno='" + orderdetno + "'", "select");
+                                        if (dt.Rows.Count > 0)
+                                        {
+                                            OperateResult.AppendText(" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'工序" + stepcode + "累计排产数量超出");
+                                            return;
+                                        }
                                         string insertQuery = "INSERT INTO MakePlanDetail (mpd_mpid,mpd_detno,mpd_id,mpd_wccode, mpd_orderdetno, mpd_ordercode,mpd_outqty,mpd_remark,mpd_stepcode) VALUES (" + id + "," + detno + ",MakePlanDetail_seq.nextval,:1, :2, :3,:4,:5,:6)";
                                         using (OracleCommand cmd = new OracleCommand(insertQuery, conn))
                                         {