销售订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号 生产订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号...

yangle

2024-01-23 90f529be12c36675a0468f7b55f9f5be28fca1c1

销售订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号 生产订单子表 增加 3个字段： 客户物料编码 、客户物料名称、客户规格型号（如果已经有了就不增加） 销售订单下推时，将这3个字段默认带入到生产订单界面上， 可修改 保存。

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -258,13 +258,19 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">客户物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;" >
                                                <input type="text" class="layui-input" name="HCusMaterName" lay-verify="HCusMaterName" id="HCusMaterName" style="display: inline-block;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">客户规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusModel" lay-verify="HCusModel" id="HCusModel" style="display: inline-block;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">客户物料编码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCusMaterNumber" lay-verify="HCusMaterNumber" id="HCusMaterNumber" style="display: inline-block;">
                                            </div>
                                        </div>
                                    </div>
@@ -1006,6 +1012,9 @@
                                , "HColorRemark": data.染色要求
                                , "HRemark": data.白坯要求
                                , "HRemark3": data.表头备注
                                , "HCusMaterNumber": data.客户物料编码
                                , "HCusModel": data.客户规格型号
                                , "HCusMaterName": data.客户物料名称
                            });

                            layer.close(ajaxLoad);
@@ -1149,6 +1158,7 @@
                            , "HColorRemark": d.data[0].染色要求
                            , "HCusMaterName": d.data[0].客户物料名称
                            , "HCusModel": d.data[0].客户规格型号
                            , "HCusMaterNumber": d.data[0].客户物料编码
                            , "HOrderPickRemark": d.data[0].订单包装备注
                            //其他信息
                            , "hmakers": OperationType == 2 ? "" : d.data[0].制单人

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -158,6 +158,7 @@
                                            </div>
                                        </div>
                                    </div>
                                   
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">备注</label>
@@ -563,7 +564,10 @@
                    "HDate": Format(new Date(), 'yyyy-MM-dd'),
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark": ""
                    "HRemark": "",
                    "HCusMaterNumber": "",
                    "HCusModel": "",
                    "HCusMaterName": ""
                };
                switch (obj.event) {
                    //新增一行
@@ -979,8 +983,9 @@
                        , { field: 'HlineTotal', title: '价税合计', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HDate', title: '交货日期', event: "HDate", width: 120 }
                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }


                        , { field: 'HCusMaterNumber', title: '客户物料编码', width: 100, edit: 'text' }
                        , { field: 'HCusModel', title: '客户规格型号', width: 100, edit: 'text' }
                        , { field: 'HCusMaterName', title: '客户物料名称', width: 100, edit: 'text' }
                        , { field: 'HDiscountRate', title: '折扣率', width: 100, edit: 'text', hide: true }
                        , { field: 'HRelTaxPrice', title: '实际含税单价', width: 110, hide: true }
                        , { field: 'HTaxMoney', title: '税额', width: 100, hide: true }
@@ -1014,7 +1019,10 @@
                    "HDate": Format(new Date(),'yyyy-MM-dd'),
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark": ""
                    "HRemark": "",
                    "HCusMaterNumber": "",
                    "HCusModel": "",
                    "HCusMaterName": ""
                }];

                option.data = rowdata;
@@ -1132,20 +1140,23 @@
                                        "HRelTaxPrice": result.data[i]["实际含税单价"],
                                        "HTaxRate": result.data[i]["税率"],
                                        "HTaxMoney": result.data[i]["税额"],
                                        "HlineTotal": dealDoubleToFixed(result.data[i]["价税合计"],2),
                                        "HlineTotal": dealDoubleToFixed(result.data[i]["价税合计"], 2),
                                        "HlineTotalBB": result.data[i]["本位币价税合计"],
                                        "HDate": formatDate(result.data[i]["交货日期"]),
                                        "HOutStockQty": result.data[i]["出库数量"],
                                        "HInvoiceQty": result.data[i]["开票数量"],
                                        "HRemark": result.data[i]["表体备注"]
                                        "HRemark": result.data[i]["表体备注"],
                                        "HCusMaterNumber": result.data[i]["客户物料编码"],
                                        "HCusModel": result.data[i]["客户规格型号"],
                                        "HCusMaterName": result.data[i]["客户物料名称"]
                                    }
                                );
                            }
                            option.data = rowdata;

                            //出库数量、开票数量不可编辑
                            option.cols[0][19].edit = null;
                            option.cols[0][20].edit = null;
                            option.cols[0][22].edit = null;
                            option.cols[0][23].edit = null;

                            table.render(option);

@@ -1832,7 +1843,8 @@
                                            var NewRow = {
                                                "HMaterID": "0", "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": "0", "计量单位": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
                                                , "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
                                                , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": ""
                                                , "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
                                                "HCusModel": "","HCusMaterName": ""
                                            }
                                            btnAddLine(NewRow);
                                        }