工艺路线撤回，出站汇报单修改时间功能能

wtt

2024-12-05 849e974e20d9894f3da95ebf504d97ce9f14c9ed

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -201,7 +201,7 @@
                      ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
                      "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
                      ",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
                      ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID,HRelationQty_OutBad,HSNCtrl" +
                      ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID,HRelationQty_OutBad,HSNCtrl,HRoutingBillMainID,HRoutingBillEntryID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
@@ -220,6 +220,7 @@
                      "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
                      "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
                      ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isInt(omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isInt(omodel.HSeOrderEntryID) + "','" + DBUtility.ClsPub.isInt(oSub.HRelationQty_OutBad) + "'," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
                      "," + oSub.HRoutingBillMainID + "," + oSub.HRoutingBillEntryID +
                      ") ");
                    oCn.RunProc(sql1);
                }
@@ -342,7 +343,26 @@
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
                {
                    omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                }

                //检查主表内码是否重复，若重复则重新生成并继续检查，直到不再重复
                DataSet ds_repeat;
                while (true)
                {
                    ds_repeat = oCn.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HInterID = " + omodel.HInterID, "Sc_ProcessExchangeBillMain");
                    if (ds_repeat != null && ds_repeat.Tables[0].Rows.Count > 0)
                    {
                        omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                    }
                    else
                    {
                        break;
                    }
                }

                //若MAINDI重复则重新获取

                //保存前控制=========================================
@@ -419,7 +439,7 @@
                      ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
                      "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
                      ",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
                      ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID,HSNCtrl" +
                      ",HMouldNo,HProcWorkNum,HSeOrderInterID,HSeOrderEntryID,HSNCtrl,HRoutingBillMainID,HRoutingBillEntryID" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
@@ -437,7 +457,8 @@
                      ",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
                      "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
                      "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
                      ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
                      ",'" + oSub.HMouldNo + "','" + oSub.HProcWorkNum + "','" + DBUtility.ClsPub.isStrNull( omodel.HSeOrderInterID) + "','" + DBUtility.ClsPub.isStrNull(omodel.HSeOrderEntryID) + "'," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) + "," + oSub.HRoutingBillMainID
                      + "," + oSub.HRoutingBillEntryID +
                      ") ");
                    sErr = sErr + sql1 + "2;";
                    oCn.RunProc(sql1);
@@ -496,12 +517,34 @@
                {
                    if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //系统参数  å·¥åºæµè½¬å¡ä¿å­˜æ—¶è‡ªåŠ¨åŒæ­¥æ¡ç ä¿¡æ¯è‡³æ¡ç æ¡£æ¡ˆ
                    {
                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                        Int64 HBarCodeInterID =  DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);

                        if (oSystemParameter.omodel.WMS_CampanyName == "添康科技")
                        {
                            oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                            ") values ("
                            + "'" + omodel.HBillNo + "','唯一条码'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
                            + ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
                            + ", " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "','3710',''"
                            + ",1,1,0,0,0,'工序流转卡保存自动同步'"
                            + ",0,'',getdate(),'',getdate()"
                            + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
                            + ",'','','',0,'','')");
                        }
                        else
                        {
                            oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                            ") values ("
                            + "'" + omodel.HBillNo + "','唯一条码'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
@@ -509,8 +552,9 @@
                            + ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
                            + ",1,1,0,0,0,'工序流转卡保存自动同步'"
                            + ",0,'',getdate(),'',getdate()"
                            + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
                            + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
                            + ",'','','',0,'','')");
                        }                        
                    }
                }
                else