rev：计算球磨时间修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/PcsIfPurchaseorderprocServiceImpl.java

@@ -443,7 +443,7 @@ public class PcsIfPurchaseorderprocServiceImpl implements PcsIfPurchaseorderproc
                     .reduce(Double::sum).orElse(0.00);
             // 合计金额：合计重量 * 含税单价
             erp.put("allqty", allqty);
-            erp.put("all_valmoney", NumberUtil.div(allqty, erp.getDoubleValue("norigtaxprice")));
+            erp.put("all_valmoney", NumberUtil.mul(allqty, erp.getDoubleValue("norigtaxprice")));
             resultList.add(erp);
         }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java

@@ -1244,10 +1244,18 @@ public class FormulaServiceImpl implements FormulaService {
             if (ja.size()>0){
                 for (Object o : ja) {
                     JSONObject item = (JSONObject) o;
-                    WQLObject.getWQLObject("PDM_BI_Formula").update(MapOf.of(
+                    JSONObject param = new JSONObject();
-                            "ball_time",item.get("qmsj"),
+                    if (ObjectUtil.isNotEmpty(item.get("qmsj"))) {
-                            "hcp_standard",item.get("hcp_bz_Avg"),
+                        param.put("erp_ball_time",item.get("qmsj"));
-                            "hcp_detection",item.get("hcp_sc_avg")),"formula_id = '"+item.get("FORMULA_ID")+"'");
+                    }
+                    if (ObjectUtil.isNotEmpty(item.get("hcp_bz_avg"))) {
+                        param.put("hcp_standard",item.get("hcp_bz_avg"));
+                    }
+                    if (ObjectUtil.isNotEmpty(item.get("hcp_sc_avg"))) {
+                        param.put("hcp_detection",item.get("hcp_sc_avg"));
+                    }
+
+                    WQLObject.getWQLObject("PDM_BI_Formula").update(param,"formula_id = '"+item.get("formula_id")+"'");
                 }
             }
         }

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql

@@ -201,7 +201,6 @@
                     OPTION 输入.formula_id <> ""
                             FORMULA_ID in 输入.formula_id
                     ENDOPTION
-                    limit 100
                 ENDSELECT
             ENDQUERY
         ENDIF

mes/qd/src/views/wms/pf/formula/ViewDialog.vue

@@ -126,8 +126,20 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="球磨时间">
+      <el-form-item label="计算球磨时间">
-        <label slot="label">球磨时间:</label>
+        <label slot="label">计算球磨时间:</label>
+        <el-input-number
+          v-model="form.erp_ball_time"
+          :controls="false"
+          :precision="2"
+          :min="1"
+          :max="9999"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="标准球磨时间">
+        <label slot="label">标准球磨时间:</label>
         <el-input-number
           v-model="form.ball_time"
           :controls="false"
@@ -153,7 +165,7 @@
       <el-form-item label="hcp检测值">
         <label slot="label">hcp检测值:</label>
         <el-input-number
-          v-model="form.ball_time"
+          v-model="form.hcp_detection"
           :controls="false"
           :precision="2"
           :min="1"

mes/qd/src/views/wms/pf/formula/index.vue

@@ -202,7 +202,8 @@
         <el-table-column prop="pcsn" min-width="130" label="批次" />
         <el-table-column prop="detail_count" min-width="100" label="明细数" />
         <el-table-column prop="masterbucket_qty" min-width="100" label="重量" :formatter="crud.formatNum3" />
-        <el-table-column prop="ball_time" min-width="100" label="球磨时间" />
+        <el-table-column prop="ball_time" min-width="100" label="标准球磨时间" />
+        <el-table-column prop="erp_ball_time" min-width="100" label="计算球磨时间" />
         <el-table-column prop="hcp_standard" min-width="100" label="hcp标准值" />
         <el-table-column prop="hcp_detection" min-width="100" label="hcp检测值" />
         <el-table-column prop="is_audit" :formatter="stateFormat2" min-width="80" label="是否审核" />