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,17 +2736,20 @@
                ",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) " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
                ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
                "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                "," + 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 + "'" +
                        ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
                        "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                        ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                        "," + 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 +
                        "," + 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();

@@ -2918,66 +2933,70 @@
                }
                //=========================================================

                string sql = "UpDate Gy_MouldFileMain set  " +
                " HBillNo='" + HBillNo + "'" +  //固定赋值===============
                ",HDate='" + HDate + "'" +
                ",HYear='" + HYear.ToString() + "'" +
                ",HPeriod='" + HPeriod.ToString() + "'" +
                ",HRemark='" + HRemark + "'" +
                ",HUpDater='" + HUpDater + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HMouldNo='" + HMouldNo + "'" +
                ",HName='" + HName + "'" +
                ",HModel='" + HModel + "'" +
                ",HModel2='" + HModel2 + "'" +
                ",HDiameter='" + HDiameter + "'" +
                ",HSubjoin='" + HSubjoin + "'" +
                ",HSubjoin2='" + HSubjoin2 + "'" +
                ",HPICNo='" + HPICNo + "'" +
                ",HWorkMaterModel='" + HWorkMaterModel + "'" +
                ",HMaterID=" + HMaterID.ToString() +
                ",HUSEORGID=" + HUSEORGID.ToString() +
                ",HMaterNumber='" + HMaterNumber + "'" +
                ",HMouldClass='" + HMouldClass + "'" +
                ",HMouldType=" + HMouleTypeID.ToString() +
                ",HUnitID=" + HUnitID.ToString() +
                ",HOutComDate='" + HOutComDate + "'" +
                ",HOutComNo='" + HOutComNo + "'" +
                ",HDeptID=" + HDeptID.ToString() +
                ",HSupID=" + HSupID.ToString() +
                ",HSupNumber='" + HSupNumber + "'" +
                ",HPrintQty=" + HPrintQty.ToString() +
                ",HMouldStatus='" + HMouldStatus + "'" +
                ",HSaveLife='" + HSaveLife + "'" +
                ",HWhID=" + HWHID.ToString() +
                ",HRoutingID=" + HRoutingID.ToString() +
                ",HBomID=" + HBOMID.ToString() +
                ",HVersion='" + HVersion + "'" +
                ",HSPGroupID=" + HSPGroupID.ToString() +
                ",HSPID=" + HSPID.ToString() +
                ",HDesignLife=" + HDesignLife.ToString() +
                ",HCaveQty=" + HCaveQty.ToString() +
                ",HUseLife=" + HUseLife.ToString() +
                ",HLeaveLife=" + HLeaveLife.ToString() +
                ",HProdQty=" + HProdQty.ToString() +
                ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
                ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                ",HMouldOWNER='" + HMouldOWNER + "'" +
                ",HNowSupID=" + HNowSupID.ToString() +
                ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
                ",HProdWeight=" + HProdWeight.ToString() +
                ",HBarCode='" + HBarCode.ToString() + "'" +
                ",HMadeSupID=" + HMadeSupID +
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                ",HInitLife='" + HInitLife + "'" +
                ",HNextMainDate='" + HNextMainDate +
                "',HMouldUseStatus='" + HMouldUseStatus +
                "' where HInterID=" + HInterID.ToString();

                //主表
                oCN.RunProc(sql);
                                //主表
                oCN.RunProc("UpDate Gy_MouldFileMain set  " +
                 " HBillNo='" + HBillNo + "'" +  //固定赋值===============
                 ",HDate='" + HDate + "'" +
                 ",HYear='" + HYear.ToString() + "'" +
                 ",HPeriod='" + HPeriod.ToString() + "'" +
                 ",HRemark='" + HRemark + "'" +
                 ",HUpDater='" + HUpDater + "'" +
                 ",HUpDateDate=getdate()" +
                 //========================================
                 ",HMouldNo='" + HMouldNo + "'" +
                 ",HName='" + HName + "'" +
                 ",HModel='" + HModel + "'" +
                 ",HModel2='" + HModel2 + "'" +
                 ",HDiameter='" + HDiameter + "'" +
                 ",HSubjoin='" + HSubjoin + "'" +
                 ",HSubjoin2='" + HSubjoin2 + "'" +
                 ",HPICNo='" + HPICNo + "'" +
                 ",HWorkMaterModel='" + HWorkMaterModel + "'" +
                 ",HMaterID=" + HMaterID.ToString() +
                 ",HUSEORGID=" + HUSEORGID.ToString() +
                 ",HMaterNumber='" + HMaterNumber + "'" +
                 ",HMouldClass='" + HMouldClass + "'" +
                 ",HMouldType=" + HMouleTypeID.ToString() +
                 ",HUnitID=" + HUnitID.ToString() +
                 ",HOutComDate='" + HOutComDate + "'" +
                 ",HOutComNo='" + HOutComNo + "'" +
                 ",HDeptID=" + HDeptID.ToString() +
                 ",HSupID=" + HSupID.ToString() +
                 ",HSupNumber='" + HSupNumber + "'" +
                 ",HPrintQty=" + HPrintQty.ToString() +
                 ",HMouldStatus='" + HMouldStatus + "'" +
                 ",HSaveLife='" + HSaveLife + "'" +
                 ",HWhID=" + HWHID.ToString() +
                 ",HRoutingID=" + HRoutingID.ToString() +
                 ",HBomID=" + HBOMID.ToString() +
                 ",HVersion='" + HVersion + "'" +
                 ",HSPGroupID=" + HSPGroupID.ToString() +
                 ",HSPID=" + HSPID.ToString() +
                 ",HDesignLife=" + HDesignLife.ToString() +
                 ",HCaveQty=" + HCaveQty.ToString() +
                 ",HUseLife=" + HUseLife.ToString() +
                 ",HLeaveLife=" + HLeaveLife.ToString() +
                 ",HProdQty=" + HProdQty.ToString() +
                 ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
                 ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                 ",HMouldOWNER='" + HMouldOWNER + "'" +
                 ",HNowSupID=" + HNowSupID.ToString() +
                 ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
                 ",HProdWeight=" + HProdWeight.ToString() +
                 ",HBarCode='" + HBarCode.ToString() + "'" +
                 ",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 +
                  "' where HInterID=" + HInterID.ToString());

                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -4444,8 +4463,8 @@
                    HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["对应ERP物料"].ToString());
                    HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位"].ToString());
                    HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["使用部门"].ToString());
                        HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓库"].ToString());
                        HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓位"].ToString());
                    HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓库"].ToString());
                    HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓位"].ToString());
                    HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商"].ToString());
                    HSupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商代码"].ToString());
                    HMadeSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["制造商"].ToString());
@@ -4793,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
                    {