销售订单子表 增加 3个字段: 客户物料编码 、客户物料名称、客户规格型号 生产订单子表 增加 3个字段: 客户物料编码 、客户物料名称、客户规格型号(如果已经有了就不增加) 销售订单下推时,将这3个字段默认带入到生产订单界面上, 可修改 保存。
4个文件已修改
21 ■■■■ 已修改文件
DAL/销售管理/ClsXs_SeOrderBill.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/ClsSc_ICMOBillSub.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/销售管理/ClsXs_SeOrderBillSub.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBill.cs
@@ -115,7 +115,8 @@
                    string subSql = "Insert into Xs_SeOrderBillSub" +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID ) " +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
                        ",HCusMaterNumber,HCusModel,HCusMaterName ) " +
                        "values(" +
                        "" + omodel.HInterID +
                        "," + oSub.HEntryID +
@@ -142,6 +143,9 @@
                        "," + oSub.HInvoiceQty + 
                        ",'" + oSub.HRemark +
                        "','" + oSub.HOrderLevID +
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                        "')";
                    oCn.RunProc(subSql);
                }
@@ -286,7 +290,8 @@
                    //  ") ");
                    string subSql = "Insert into Xs_SeOrderBillSub" +
                        "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID) " +
                        ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
                        ",HCusMaterNumber,HCusModel,HCusMaterName) " +
                        "values(" +
                        "" + omodel.HInterID +
                        "," + oSub.HEntryID +
@@ -313,6 +318,9 @@
                        "," + oSub.HInvoiceQty +
                        ",'" + oSub.HRemark +
                        "','" + oSub.HOrderLevID +
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                        "')";
                    oCn.RunProc(subSql);
                }
Model/Éú²ú¹ÜÀí/ClsSc_ICMOBillSub.cs
@@ -43,6 +43,7 @@
        public string HCusMaterName; //客户物料名称
        public string HCusModel; //客户规格型号 
        public string HCusMaterNumber; //客户物料编码
        public object HOrderPickRemark { get; set; }
Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillSub.cs
@@ -23,6 +23,10 @@
        public double HInvoiceQty;//         dec(18,8)    --开票数量(不可编辑)            --addnew
        public string HRemark;//         varchar(200)        --备注
        public string HCusMaterNumber;  //客户物料编码
        public string HCusModel; //客户规格型号
        public string HCusMaterName;  //客户物料名称
        public Int64 HInterID;
        public Int64 HEntryID;
WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -650,14 +650,14 @@
                ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
                ,HBomID,HEntryCusID,HSTOCKINORGID
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
                ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark)
                ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber)
                 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.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}')");
            //保存后控制=========================================              
            ds = oCN.RunProcReturn("exec h_p_Sc_ICMOBill_AfterSaveCtrl_New " + HInterID, "h_p_Sc_ICMOBill_AfterSaveCtrl_New");