生产订单，工序流转卡 增加 生产白坯要求HRemark_New，生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterMo...

duhe

2024-03-11 852c9fdb5e8640e5354221565d4c3f8112a3d15b

生产订单，工序流转卡 增加 生产白坯要求HRemark_New，生产幅宽HWidth_New、生产克重HWeight_New、产品规格HMaterModel字段，生产订单可以编辑生产白坯要求、生产幅宽、生产克重、产品规格，下推（批量下推）工序流转卡带入生产白坯要求、生产幅宽、生产克重、产品规格

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

@@ -164,7 +164,9 @@
                //加入生产类型
                ",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
                ",HWidth_New=" + omodel.HWidth_New +
                ",HMaterModel_New='" + omodel.HMaterModel_New + "'" +
                ",HWeight_New=" + omodel.HWeight_New +
                ",HRemark_New='" + omodel.HRemark_New + "'" +
                ",HMaterModel2='" + omodel.HMaterModel2 + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //更新主表
                oCn.RunProc(sql);
@@ -372,7 +374,7 @@
               ", HRoutingBillID,HMaterModel,HWidth,HWeight,HAuxQty,HAuxUnit,HSplitNo" +
               ",HHeight,HInches,HAl1Long,HDensity,HTela,HUnderTela,HSizing,HSellDate" +
               ",HRemark2,HRemark3,HEmpID,HCusID,HColorRemark,HSplitSumQty,HSplitColorQty,HMachineLine" +
               ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HMaterModel_New) " +
               ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HOrderLevID,HWidth_New,HRemark_New,HWeight_New,HMaterModel2) " +
                " values('" + this.BillType + "','" + omodel.HBillSubType + "','" + (omodel.HMainSourceBillSubType==null?"": omodel.HMainSourceBillSubType) + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
                "," + omodel.HWWOrderInterID.ToString() + "," + omodel.HWWOrderEntryID.ToString() + ",'" + omodel.HWWOrderBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HEquipMentID.ToString() +
@@ -387,7 +389,7 @@
                "','"+ omodel.HRoutingBillID + "','"+ omodel.HMaterModel + "',"+ omodel.HWidth + ","+ omodel.HWeight + ","+ omodel.HAuxQty + ","+ omodel.HAuxUnit +","+ omodel.HSplitNo +"" +
                ",'" + omodel.HHeight + "','" + omodel.HInches + "','" + omodel.HAl1Long + "','" + omodel.HDensity + "','" + omodel.HTela + "','" + omodel.HUnderTela + "','" + omodel.HSizing + "','" + omodel.HSellDate + "'" +
                ",'"+ omodel.HRemark2 + "','"+ omodel.HRemark3 + "',"+ omodel.HEmpID + "," + omodel.HCusID + ",'"+ omodel.HColorRemark + "',"+ omodel.HSplitSumQty + ","+ omodel.HSplitColorQty + ",'"+ omodel.HMachineLine + "'" +
                ","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HMaterModel_New + "'" +
                ","+ omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HOrderLevID + "'," + omodel.HWidth_New + ",'" + omodel.HRemark_New + "'," + omodel.HWeight_New + ",'" + omodel.HMaterModel2 + "'" +
                ")");
                sErr = sErr + "1;";
                //插入子表

 Model/Éú²ú¹ÜÀí/ClsSc_ICMOBillSub.cs

@@ -49,7 +49,9 @@

        public Int64 HOrderLevID { get; set; }

        public double HWidth_New;          //decimal(18,8) æ–°ç™½å¯é—¨å¹…
        public string HMaterModel_New;     //varchar(100)  æ–°ç™½å¯è§„æ ¼
        public double HWidth_New;           //decimal(18,8) ç”Ÿäº§å¹…宽
        public double HWeight_New;          //decimal(18,8) ç”Ÿäº§å…‹é‡
        public string HRemark_New;          //varchar(100)  ç”Ÿäº§ç™½å¯è¦æ±‚
        public string HModel;          //varchar(100)  è§„格型号
    }
}

 Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillMain.cs

@@ -102,7 +102,9 @@

        public string HMainSourceBillSubType;

        public double HWidth_New;          //decimal(18,8) æ–°ç™½å¯é—¨å¹…
        public string HMaterModel_New;     //varchar(100)  æ–°ç™½å¯è§„æ ¼
        public double HWidth_New;           //decimal(18,8) ç”Ÿäº§å¹…宽
        public double HWeight_New;           //decimal(18,8) ç”Ÿäº§å…‹é‡
        public string HRemark_New;          //varchar(100)  ç”Ÿäº§ç™½å¯è¦æ±‚
        public string HMaterModel2;         //varchar(100)  äº§å“è§„æ ¼
    }
}

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -672,14 +672,14 @@
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HBomID,HEntryCusID,HSTOCKINORGID
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber,HWidth_New,HMaterModel_New) 
                ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber,HWidth_New,HWeight_New,HMaterModel,HRemark_New) 
                 values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
                ,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
                 ,{oSub.HBomID}  ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
                        ,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',0,0
                ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}',{oSub.HWidth_New},'{oSub.HMaterModel_New}')");
                ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}',{oSub.HWidth_New},{oSub.HWeight_New},'{oSub.HModel}','{oSub.HRemark_New}')");


            objJsonResult.code = "1";