计划上传优化

FileWatcher/UploadMakePlan.Designer.cs

@@ -53,10 +53,10 @@
             // 
             // OperateResult
             // 
-            this.OperateResult.Location = new System.Drawing.Point(979, 12);
+            this.OperateResult.Location = new System.Drawing.Point(849, 12);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(506, 564);
+            this.OperateResult.Size = new System.Drawing.Size(786, 820);
             this.OperateResult.TabIndex = 7;
             this.OperateResult.Text = "";
             // 
@@ -125,7 +125,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1498, 640);
+            this.ClientSize = new System.Drawing.Size(1648, 844);
             this.Controls.Add(this.ChooseFile);
             this.Controls.Add(this.Upload);
             this.Controls.Add(this.label2);

FileWatcher/UploadMakePlan.cs

@@ -150,16 +150,16 @@ namespace FileWatcher
                                         string day = today.ToString("yyyy-MM-dd");
                                         if (dh.CheckExist("MakePlanDetail left join makeplan on mpd_mpid=mp_id ", "trunc(mp_begintime)=to_date('" + day + "','yyyy-mm-dd') and mpd_orderdetno='" + orderdetno + "' and mpd_ordercode='" + ordercode + "' and mpd_wccode='" + wccode + "'"))
                                         {
-                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "' 工作中心'" + wccode + "' 重复\n";
+                                            ErrMessage += sheetName+" 序号'" + orderdetno + "' 销售订单'" + ordercode + "' 工作中心'" + wccode + "' 重复\n";
                                         }
                                         //销售订单 + 订单序号存在ERP中，才允许上传
                                         if (!dh.CheckExist("saledetail@ERP left join sale@ERP on sa_id=sd_said", "SD_DETNO='" + orderdetno + "' and sa_code='" + ordercode + "'"))
                                         {
-                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在\n";
+                                            ErrMessage += sheetName+" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'不存在\n";
                                         }
                                         if (!dh.CheckExist("make", "ma_saledetno='" + orderdetno + "' and ma_salecode='" + ordercode + "'"))
                                         {
-                                            ErrMessage += " 序号'" + orderdetno + "' 销售订单'" + ordercode + "'未匹配到工单号\n";
+                                            ErrMessage += sheetName+" 序号'" + orderdetno + "' 销售订单'" + ordercode + "'未匹配到工单号\n";
                                         }
                                         //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, " +