Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yxj

2025-11-28 5286b614c84f8f82f81772cdb32c2dc5a0d26e0f

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -2695,6 +2695,12 @@
                string HMouldUseStatus = mainList[0].HMouldUseStatus;
                int HCREATEORGID = mainList[0].HCREATEORGID;
                int HUSEORGID = mainList[0].HUSEORGID;
                bool HTransPackFlag = mainList[0].HTransPackFlag;     //周转容器标记
                bool HSendPackFlag = mainList[0].HSendPackFlag;       //发货容器标记
                int HMouldLength = mainList[0].HMouldLength;          //长
                int HMouldWidth = mainList[0].HMouldWidth;            //宽
                int HMouldHeight = mainList[0].HMouldHeight;          //高
                int HMouldFoldHeight = mainList[0].HMouldFoldHeight;  //折叠高度

                //保存前控制=========================================
                string HBillNote = "";
@@ -2730,7 +2736,9 @@
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID) " +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
                 ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag ) " +

                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -2740,7 +2748,8 @@
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "',"+ HCREATEORGID + ","+ HUSEORGID + ") ");
                        ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
                        "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + ") ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -2893,6 +2902,12 @@
                string HMouldUseStatus = mainList[0].HMouldUseStatus;
                int HUSEORGID = mainList[0].HUSEORGID;
                DateTime HNextMainDate = mainList[0].HNextMainDate;
                bool HTransPackFlag = mainList[0].HTransPackFlag;     //周转容器标记
                bool HSendPackFlag = mainList[0].HSendPackFlag;       //发货容器标记
                int HMouldLength = mainList[0].HMouldLength;          //长
                int HMouldWidth = mainList[0].HMouldWidth;            //宽
                int HMouldHeight = mainList[0].HMouldHeight;          //高
                int HMouldFoldHeight = mainList[0].HMouldFoldHeight;  //折叠高度
                //若MAINDI重复则重新获取
                oCN.BeginTran();

@@ -2972,6 +2987,12 @@
                ",HMadeSupID=" + HMadeSupID +
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                 ",HTransPackFlag=" + Convert.ToString(HTransPackFlag ? 1 : 0) +
                 ",HSendPackFlag=" + Convert.ToString(HSendPackFlag ? 1 : 0) +
                 ",HMouldLength=" + HMouldLength +
                 ",HMouldWidth=" + HMouldWidth +
                 ",HMouldHeight=" + HMouldHeight +
                 ",HMouldFoldHeight=" + HMouldFoldHeight +
                ",HInitLife='" + HInitLife +
                "',HNextMainDate='" + HNextMainDate +
                "',HMouldUseStatus='" + HMouldUseStatus +
@@ -4791,7 +4812,7 @@
                        "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                        "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                        ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                        ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");
                        ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + " ) ");
                    }
                    else
                    {