Browse Source

修改拆箱BUG

章政 7 years ago
parent
commit
945f6f0e84

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -729,7 +729,7 @@ namespace UAS_MES.Make
                                     }
                                     //更新序列号状态
                                     SQLS1.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ma_code + "' and mcd_stepcode='" + ms_stepcode + "'");
-                                    SQLS1.Add("update makeserial set ms_status=1,ms_outboxcode='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code + "'");
+                                    SQLS1.Add("update makeserial set ms_status=1,ms_outboxcode='',ms_nextstepcode= (case when ms_nextstepcode='" + User.CurrentStepCode + "' then ms_nextstepcode else ms_stepcode end ) where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code + "'");
                                     SQLS1.Add("delete from makeprocess where mp_sncode='" + ms_sncode + "' and mp_makecode='" + ma_code + "' and mp_stepcode='" + ms_stepcode + "'");
                                     SQLS1.Add("delete from steppassed where sp_sncode='" + ms_sncode + "' and sp_makecode='" + ma_code + "' and sp_stepcode='" + ms_stepcode + "'");
                                     //抽检批次不为空的时候进行移除

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -724,7 +724,7 @@ namespace UAS_MES.Make
                                     }
                                     //更新序列号状态
                                     SQLS1.Add("update makecraftdetail set mcd_inqty=mcd_inqty-1,mcd_okqty=mcd_okqty-1 where mcd_macode='" + ma_code + "' and mcd_stepcode='" + ms_stepcode + "'");
-                                    SQLS1.Add("update makeserial set ms_status=1,ms_outboxcode='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code + "'");
+                                    SQLS1.Add("update makeserial set ms_status=1,ms_outboxcode='',ms_nextstepcode= (case when ms_nextstepcode='" + User.CurrentStepCode + "' then ms_nextstepcode else ms_stepcode end ) where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code + "'");
                                     SQLS1.Add("delete from makeprocess where mp_sncode='" + ms_sncode + "' and mp_makecode='" + ma_code + "' and mp_stepcode='" + ms_stepcode + "'");
                                     SQLS1.Add("delete from steppassed where sp_sncode='" + ms_sncode + "' and sp_makecode='" + ma_code + "' and sp_stepcode='" + ms_stepcode + "'");
                                     //抽检批次不为空的时候进行移除