Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -56,7 +56,7 @@ namespace UAS_MES.Warehouse
             needMakeIn = dh.GetConfig("needMakeIn", "MESSetting").ToString();
             input.Focus();
             OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
-         
+
 
         }
 
@@ -350,7 +350,7 @@ namespace UAS_MES.Warehouse
                                         return;
                                     }
                                 }
-                           
+
                                 if (ms_outno != "")
                                 {
                                     OperateResult.AppendText("序列号" + input.Text + "已经被出货单:" + ms_outno + "采集\n", Color.Red, input);
@@ -548,7 +548,7 @@ namespace UAS_MES.Warehouse
                                 }
                                 dh.ExecuteSql("delete from prodiomac where pim_id in (select pim_id from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_mac='" + input.Text + "' and pim_inorout='OUT' and pim_class='出货')", "delete");
                                 dh.UpdateByCondition("makeserial", " ms_outno = ''", "ms_id = '" + ms_id + "'");
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "取消出货备货", "序列号" + input.Text + "取消出货备货成功",  input.Text, "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "取消出货备货", "序列号" + input.Text + "取消出货备货成功", input.Text, "");
                                 OperateResult.AppendText("序列号" + input.Text + "取消备货成功\n", Color.Black, input);
                             }
                             else
@@ -621,14 +621,14 @@ namespace UAS_MES.Warehouse
                 sql.Append(" group by ms_prodcode,ms_salecode) left join (select pd_ordercode,pd_prodcode,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode=pd_prodcode),0)ungetqty");
                 sql.Append("  from (select pd_ordercode,pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode,pd_ordercode)) on ms_prodcode=pd_prodcode where nvl(pd_prodcode,' ')<>' ' and ms_salecode<>pd_ordercode or(ms_salecode=pd_ordercode and cn>nvl(ungetqty,0))");
                 DataTable dtAA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if (dtAA.Rows.Count>0)
+                if (dtAA.Rows.Count > 0)
                 {
                     string badmessgae = "";
                     for (int i = 0; i < dtAA.Rows.Count; i++)
                     {
                         badmessgae += "物料号:" + dtAA.Rows[i]["ms_prodcode"].ToString() + "，订单号:" + dtAA.Rows[i]["ms_salecode"].ToString() + "，数量:" + dtAA.Rows[i]["cn"].ToString() + "\n";
                     }
-                    OperateResult.AppendText(type + input.Text + "内的序列号中的物料+订单不在出货单中或者所装的序列号的数量大于剩余出货数，"+badmessgae, Color.Red, input);
+                    OperateResult.AppendText(type + input.Text + "内的序列号中的物料+订单不在出货单中或者所装的序列号的数量大于剩余出货数，" + badmessgae, Color.Red, input);
                     return false;
                 }
                 else
@@ -687,7 +687,7 @@ namespace UAS_MES.Warehouse
                 OperateResult.AppendText(type + input.Text + "处于下地状态，若需出货，请先取消下地\n", Color.Red, input);
                 return false;
             }
-        
+
             if (dt.Rows[0]["pa_outno"].ToString() != "")
             {
                 OperateResult.AppendText(type + input.Text + "已经被出货单" + dt.Rows[0]["pa_outno"].ToString() + "采集\n", Color.Red, input);

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -101,7 +101,7 @@ namespace UAS_MES.Warehouse
                                 OperateResult.AppendText("箱号" + input.Text + "已经装大箱或者栈板" + pa_mothercode + "，不允许单独操作\n", Color.Red, input);
                                 return;
                             }
-                            if (!CheckStatus(pa_downstatus, pa_status, pa_iostatus, pa_outno, "大箱"))
+                            if (!CheckStatus(pa_downstatus, pa_status, pa_iostatus, pa_outno, "箱"))
                                 return;
                             insertprodiomac(pa_id, pa_makecode, "BOX");
                             OperateResult.AppendText("箱号" + input.Text + "完工入库成功\n", Color.Green);
@@ -207,7 +207,7 @@ namespace UAS_MES.Warehouse
                             }
                             DeleteData();
                             deleteprodiomac(pa_id, pa_makecode, "PALLET");
-                            OperateResult.AppendText("栈板" + input.Text + "取消完工入库成功\n", Color.Green,input);
+                            OperateResult.AppendText("栈板" + input.Text + "取消完工入库成功\n", Color.Green, input);
                         }
                         else
                         {
@@ -252,7 +252,7 @@ namespace UAS_MES.Warehouse
                             }
                             DeleteData();
                             deleteprodiomac(pa_id, pa_makecode, "BOX");
-                            OperateResult.AppendText("箱号" + input.Text + "取消完工入库成功\n", Color.Green,input);
+                            OperateResult.AppendText("箱号" + input.Text + "取消完工入库成功\n", Color.Green, input);
                         }
                         else
                         {
@@ -301,8 +301,8 @@ namespace UAS_MES.Warehouse
                             sql.Append(" pim_mac='" + input.Text + "' and pim_inorout='IN' AND pim_class='完工入库' )");
                             dh.ExecuteSql(sql.GetString(), "delete");
                             dh.UpdateByCondition("makeserial", "ms_iostatus=0", " ms_id='" + ms_id + "'");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "取消完工入库", "序列号" + input.Text + "取消完工入库成功",  input.Text , "");
-                            OperateResult.AppendText("序列号" + input.Text + "取消完工入库成功\n", Color.Green,input);
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "序列号" + input.Text + "取消完工入库", "序列号" + input.Text + "取消完工入库成功", input.Text, "");
+                            OperateResult.AppendText("序列号" + input.Text + "取消完工入库成功\n", Color.Green, input);
                         }
                     }
                     else
@@ -313,7 +313,7 @@ namespace UAS_MES.Warehouse
 
                 }
                 getqty.Text = ((DataTable)bindingSource1.DataSource).Rows.Count.ToString();
-             
+
             }
         }
 
@@ -415,8 +415,8 @@ namespace UAS_MES.Warehouse
                 sql.Clear();
                 sql.Append("select pim_id,pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
                 sql.Append("left join product on pr_code=pim_prodcode where pim_outboxcode='" + input.Text + "' and pim_inorout='IN' AND pim_class='完工入库'");
-                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select"); 
-                BaseUtil.FillDgvWithDataTable(InOutDetailDGV,BaseUtil.DataTableMerge((DataTable)bindingSource1.DataSource,dt, "pim_id"));
+                DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                BaseUtil.FillDgvWithDataTable(InOutDetailDGV, BaseUtil.DataTableMerge((DataTable)bindingSource1.DataSource, dt, "pim_id"));
             }
             else
             {