物料：物料公式 增加 助剂（按水算） 染厂领料单：根据新加的物料公式 增加运算逻辑，调整原先的运算逻辑

duhe

9 天以前 f11a612baae83f450fe5261dd8b03c63bf0a1956

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillLEdit.html

@@ -827,7 +827,9 @@
                        if (HMaterRuleType == "染料") {
                            option.data[i].HQty = option.data[i].HRate * HWeight;
                        } else if (HMaterRuleType == "助剂") {
                            option.data[i].HQty = option.data[i].HRate * HWaterQty;
                            option.data[i].HQty = option.data[i].HRate * HWaterQty * 0.001;
                        } else if (HMaterRuleType == "助剂（按水算）") {
                            option.data[i].HQty = option.data[i].HRate * HWeight * 0.001;
                        }
                    }
                    table.render(option);
@@ -846,7 +848,9 @@
                        if (HMaterRuleType == "染料") {
                            option.data[i].HQty = option.data[i].HRate * HWeight;
                        } else if (HMaterRuleType == "助剂") {
                            option.data[i].HQty = option.data[i].HRate * HWaterQty;
                            option.data[i].HQty = option.data[i].HRate * HWaterQty * 0.001;
                        } else if (HMaterRuleType == "助剂（按水算）") {
                            option.data[i].HQty = option.data[i].HRate * HWeight * 0.001;
                        }
                    }
                    table.render(option);
@@ -1051,7 +1055,9 @@
                        if (HMaterRuleType == "染料") {
                            HQty = HRate * HWeight;
                        } else if (HMaterRuleType == "助剂") {
                            HQty = HRate * HWaterQty;
                            HQty = HRate * HWaterQty * 0.001;
                        } else if (HMaterRuleType == "助剂（按水算）") {
                            HQty = HRate * HWeight * 0.001;
                        }
                        //同步更新表格和缓存对应的值
                        obj.update({
@@ -1069,7 +1075,9 @@
                        if (HMaterRuleType == "染料") {
                            HQty = HRate * HWeight;
                        } else if (HMaterRuleType == "助剂") {
                            HQty = HRate * HWaterQty;
                            HQty = HRate * HWaterQty * 0.001;
                        } else if (HMaterRuleType == "助剂（按水算）") {
                            HQty = HRate * HWeight * 0.001;
                        }
                        //同步更新表格和缓存对应的值
                        obj.update({
@@ -1646,7 +1654,9 @@
                                        if (option.data[rowIndex + i].HMaterRuleType == "染料") {
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight;
                                        } else if (option.data[rowIndex + i].HMaterRuleType == "助剂") {
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty;
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty * 0.001;
                                        } else if (option.data[rowIndex + i].HMaterRuleType == "助剂（按水算）") {
                                            option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight * 0.001;
                                        }
                                    }
                                    table.render(option);
@@ -2032,10 +2042,10 @@
                            layer.msg("明细记录第" + (i + 1) + "行,计量单位为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        //if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
                        //    layer.msg("明细记录第" + (i + 1) + "行,物料公式为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        //    return Result = false;
                        //}
                        if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,物料公式为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        temp = sSubStr[i].HRate + "";
                        if (temp == "" || temp *1 == "0") {
                            layer.msg("明细记录第" + (i + 1) + "行,用量为空或为0!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });