yusijie
2023-03-10 3fd4847817d5e865f01c06aed880102cc27de043
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
2个文件已修改
8 ■■■■ 已修改文件
Model/生产管理/ClsSc_ICMOBillSub.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Éú²ú¹ÜÀí/ClsSc_ICMOBillSub.cs
@@ -21,6 +21,7 @@
        public Int64 HBomID;
        public Int64 HCusID;
        public Int64 HSTOCKINORGID;
        public Int64 HSEQ; //单据行号
        public string HINSTOCKTYPE;      //入库类型,
        public Int64 HCHECKPRODUCT;        //产品检验,
@@ -33,5 +34,6 @@
        public Int64 HPRODUCTTYPE;            //产品类型,
        public Int64 HCOSTRATE;            // æƒé‡,
        public Int64 HBASEUNITID;        //基本计量单位,
        public string HBatchNo;        //生产批次号,
    }
}
WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -300,12 +300,14 @@
                ,HPlanBeginDate,HPlanEndDate
                ,HBeginDate,HEndDate
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ)
                 values({oSub.HInterID},{oSub.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.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.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},4
                        ,0,0,'','',0,0)");
                        ,0,0,'','',0,0
                ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ})");
                }
                foreach (var _item in _mainList)