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

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -257,7 +257,7 @@ namespace UAS_MES.Warehouse
                                 return;
                             //更新箱号对应的出货单号
                             dh.UpdateByCondition("package", "pa_outno = '" + pi_inoutno.Text + "'", "pa_outboxcode = '" + input.Text + "'");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "栈板" + input.Text + "出货备货", "栈板" + input.Text + "出货备货成功", "", "栈板号" + input.Text + "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "栈板" + input.Text + "出货备货", "栈板" + input.Text + "出货备货成功", "", input.Text);
                         }
                         else if (bigboxBtn.Checked)
                         {
@@ -288,7 +288,7 @@ namespace UAS_MES.Warehouse
                                 return;
                             //更新箱号对应的出货单号
                             dh.UpdateByCondition("package", "pa_outno = '" + pi_inoutno.Text + "'", "pa_outboxcode = '" + input.Text + "'");
-                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "箱号" + input.Text + "出货备货", "箱号" + input.Text + "出货备货成功", "", "箱号" + input.Text + "");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "箱号" + input.Text + "出货备货", "箱号" + input.Text + "出货备货成功", "", input.Text);
                         }
                         else if (serBtn.Checked)
                         {
@@ -370,7 +370,7 @@ namespace UAS_MES.Warehouse
                                 {
                                     updatesn(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, "");
                             }
                         }
                         else
@@ -442,7 +442,7 @@ namespace UAS_MES.Warehouse
                                 dh.ExecuteSql("delete from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_outboxcode='" + input.Text + "' and pim_type='PALLET' and pim_inorout='OUT'  AND pim_class='出货'", "delete");
                                 dh.UpdateByCondition("package", "pa_outno=''", "pa_outboxcode='" + input.Text + "'");
                                 OperateResult.AppendText("栈板号" + input.Text + "取消备货成功\n", Color.Black, input);
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "栈板" + input.Text + "取消出货备货", "栈板" + input.Text + "取消出货备货成功", "", "栈板号" + input.Text + "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "栈板" + input.Text + "取消出货备货", "栈板" + input.Text + "取消出货备货成功", "", input.Text);
                             }
                             else
                             {
@@ -490,7 +490,7 @@ namespace UAS_MES.Warehouse
                                 dh.ExecuteSql("delete from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_outboxcode='" + input.Text + "' and pim_type='BOX' and pim_inorout='OUT'  AND pim_class='出货'", "delete");
                                 dh.UpdateByCondition("package", "pa_outno=''", "pa_outboxcode='" + input.Text + "'");
                                 OperateResult.AppendText("箱号" + input.Text + "取消备货成功\n", Color.Black, input);
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "箱号" + input.Text + "取消出货备货", "箱号" + input.Text + "取消出货备货成功", "", "箱号" + input.Text + "");
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, dt.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "箱号" + input.Text + "取消出货备货", "箱号" + input.Text + "取消出货备货成功", "", input.Text);
                             }
                             else
                             {
@@ -507,7 +507,7 @@ namespace UAS_MES.Warehouse
                                 return;
                             }
                             sql.Clear();
-                            sql.Append("select ms_status,nvl(ms_downstatus,0)ms_downstatus,ms_outboxcode,ms_makecode ");
+                            sql.Append("select ms_status,nvl(ms_downstatus,0)ms_downstatus,ms_outboxcode,ms_makecode,");
                             sql.Append("nvl(ms_iostatus,0)ms_iostatus,ms_prodcode,ms_outno from makeserial  where ms_id='" + ms_id + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
@@ -536,9 +536,9 @@ namespace UAS_MES.Warehouse
                                     OperateResult.AppendText("箱号" + input.Text + "已经装大箱:" + ms_outboxcode + ",不允许单独操作\n", Color.Red, input);
                                     return;
                                 }
-                                dh.ExecuteSql("delete from prodiomac where pim_id =(select max(pim_id) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_mac='" + input.Text + "' and pim_inorout='IN' and pim_class='完工入库')", "delete");
+                                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_iostatus=1 , 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

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -167,7 +167,7 @@ namespace UAS_MES.Warehouse
                             sql.Append("values(prodiomac_seq.nextval,'" + ms_prodcode + "','" + input.Text + "',sysdate,'" + User.UserCode + "',' ','IN','完工入库')");
                             dh.ExecuteSql(sql.GetString(), "insert");
                             dh.UpdateByCondition("makeserial", "ms_iostatus=1", " 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.Green);
                         }
                     }
@@ -177,6 +177,7 @@ namespace UAS_MES.Warehouse
                         return;
                     }
                     LoadGridData();
+                    input.Clear();
                 }
                 else
                 {
@@ -206,7 +207,7 @@ namespace UAS_MES.Warehouse
                             }
                             DeleteData();
                             deleteprodiomac(pa_id, pa_makecode, "PALLET");
-                            OperateResult.AppendText("栈板" + input.Text + "取消完工入库成功\n", Color.Green);
+                            OperateResult.AppendText("栈板" + input.Text + "取消完工入库成功\n", Color.Green,input);
                         }
                         else
                         {
@@ -251,7 +252,7 @@ namespace UAS_MES.Warehouse
                             }
                             DeleteData();
                             deleteprodiomac(pa_id, pa_makecode, "BOX");
-                            OperateResult.AppendText("箱号" + input.Text + "取消完工入库成功\n", Color.Green);
+                            OperateResult.AppendText("箱号" + input.Text + "取消完工入库成功\n", Color.Green,input);
                         }
                         else
                         {
@@ -300,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);
+                            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
@@ -373,7 +374,7 @@ namespace UAS_MES.Warehouse
             else
                 type = "栈板";
 
-            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "完工入库", type + "号" + input.Text + "完工入库成功", "", type + "号" + input.Text + "");
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "完工入库", type + "号" + input.Text + "完工入库成功", "", input.Text);
             return;
         }
 
@@ -435,7 +436,7 @@ namespace UAS_MES.Warehouse
             sql.Append(" pim_outboxcode='" + input.Text + "' and pim_type='" + type + "' and pim_inorout='IN' AND pim_class='完工入库' )");
             dh.ExecuteSql(sql.GetString(), "delete");
             dh.UpdateByCondition("package", "pa_iostatus=0", "pa_id='" + pa_id + "'");
-            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "取消完工入库", type + "号" + input.Text + "取消完工入库成功", "", type + "号" + input.Text + "");
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, type + "号" + input.Text + "取消完工入库", type + "号" + input.Text + "取消完工入库成功", "", input.Text);
             return;
         }