代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java

@@ -270,6 +270,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         // 更新保养单主表
         JSONObject jsonMainMst = mainMstTab.query("maint_id = '" + whereJson.getString("maint_id") + "'").uniqueResult(0);
         jsonMainMst.put("invstatus", "03");
+        jsonMainMst.put("update_optname",whereJson.getString("update_optname") );
         jsonMainMst.put("real_start_date", DateUtil.now());
         mainMstTab.update(jsonMainMst);
 
@@ -318,6 +319,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
         WQLObject lifeTab = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 设备声明周期表
         WQLObject dtlTab = WQLObject.getWQLObject("EM_BI_DeviceMaintenanceDtl");
 
+        this.submitMain(whereJson);
 
         // 1.明细中的是否完成 ：必须为全部完成
         JSONArray dtlArr = dtlTab.query("maint_id = '" + maint_id + "'").getResultJSONArray(0);

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java

@@ -141,7 +141,7 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
         JSONObject jsonResult1 = new JSONObject();
         jsonResult1.put("prop", "0");
         jsonResult1.put("label", "质检单号");
-        jsonResultArr.add(jsonResult1);
+//        jsonResultArr.add(jsonResult1);
         JSONObject jsonResult2 = new JSONObject();
         jsonResult2.put("prop", "1");
         jsonResult2.put("label", "物料编码");
@@ -163,8 +163,8 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService {
         JSONObject jsonResult19 = new JSONObject();
         jsonResult19.put("prop", "19");
         jsonResult19.put("label", "金相备注");
-        jsonResultArr.add(jsonResult2);
+//        jsonResultArr.add(jsonResult2);
-        jsonResultArr.add(jsonResult20);
+//        jsonResultArr.add(jsonResult20);
         jsonResultArr.add(jsonResult21);
         jsonResultArr.add(jsonResult3);
         jsonResultArr.add(jsonResult4);

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PowderOrderQueryServiceImpl.java

@@ -71,6 +71,27 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
                     jsonResult.put(jsonDtl.getString("material_id") +"formula_qty",jsonDtl.getString("formula_qty"));
                 }
             }
+            // 碳平衡
+            jsonResult.put("3", json.getString("c_balance"));
+            // 时间
+            jsonResult.put("4", json.getString("ball_time"));
+            // 球料比
+            jsonResult.put("5", json.getString("ball_rate"));
+            // 液料比
+            jsonResult.put("6", json.getString("liquid_rate"));
+            // 球磨机号
+            HashMap<String, String> map1 = new HashMap<>();
+            map1.put("flag", "3");
+            map1.put("product_series_id", json.getString("product_series_id"));
+            map1.put("workprocedure_id", "1472449856613257216");
+            JSONObject jsonDevice1 = WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+            map1.put("flag", "4");
+            JSONObject jsonDevice2= WQL.getWO("QPF_POINTCARD01").addParamMap(map1).process().uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(jsonDevice1) && ObjectUtil.isNotEmpty(jsonDevice2)) {
+                String device_code_1 = jsonDevice1.getString("device_code").substring(4, 6);
+                String device_code_2 = jsonDevice2.getString("device_code").substring(4, 6);
+                jsonResult.put("7", device_code_1 + "-" + device_code_2);
+            }
             jsonResultArr.add(jsonResult);
         }
         resultJson.put("content",jsonResultArr);
@@ -81,19 +102,6 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
     public JSONArray getHeader() {
         JSONArray jsonResultArr = new JSONArray();
 
-        JSONObject jsonResult1 = new JSONObject();
-        jsonResult1.put("prop", "0");
-        jsonResult1.put("label", "日期");
-        jsonResultArr.add(jsonResult1);
-        JSONObject jsonResult2 = new JSONObject();
-        jsonResult2.put("prop", "1");
-        jsonResult2.put("label", "产品编码");
-        jsonResultArr.add(jsonResult2);
-        JSONObject jsonResult3 = new JSONObject();
-        jsonResult3.put("prop", "2");
-        jsonResult3.put("label", "批号");
-        jsonResultArr.add(jsonResult3);
-
         String classIds = classstandardService.getAllChildIdStr(MaterOptTypeEnum.YL_AND_FL.getClass_idStr());
         String RF = classstandardService.getAllChildIdStr(MaterOptTypeEnum.RF.getClass_idStr());
         JSONArray resultJSONArray = WQL.getWO("QP_POWDERORDERQUERY01").addParam("flag", "2").addParam("classIds", classIds).addParam("rf", RF).process().getResultJSONArray(0);
@@ -104,10 +112,10 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
             jsonResult4.put("prop",json.getString("material_id"));
             jsonResult4.put("label","物料" + NumberUtil.add(String.valueOf(i), "1") + "");
             jsonResultArr.add(jsonResult4);
-            JSONObject jsonResult5 = new JSONObject();
+//            JSONObject jsonResult5 = new JSONObject();
-            jsonResult5.put("prop",json.getString("material_code")+"");
+//            jsonResult5.put("prop",json.getString("material_code")+"");
-            jsonResult5.put("label","物料编码");
+//            jsonResult5.put("label","物料编码");
-            jsonResultArr.add(jsonResult5);
+//            jsonResultArr.add(jsonResult5);
             JSONObject jsonResult6 = new JSONObject();
             jsonResult6.put("prop",json.getString("material_id")+"pcsn");
             jsonResult6.put("label","批次");
@@ -117,6 +125,28 @@ public class PowderOrderQueryServiceImpl implements PowderOrderQueryService {
             jsonResult7.put("label","重量");
             jsonResultArr.add(jsonResult7);
         }
+
+        JSONObject jsonResult1 = new JSONObject();
+        jsonResult1.put("prop", "3");
+        jsonResult1.put("label", "碳平衡(%)");
+        jsonResultArr.add(jsonResult1);
+        JSONObject jsonResult2 = new JSONObject();
+        jsonResult2.put("prop", "4");
+        jsonResult2.put("label", "时间(h)");
+        jsonResultArr.add(jsonResult2);
+        JSONObject jsonResult3 = new JSONObject();
+        jsonResult3.put("prop", "5");
+        jsonResult3.put("label", "球料比");
+        jsonResultArr.add(jsonResult3);
+        JSONObject jsonResult8 = new JSONObject();
+        jsonResult8.put("prop", "6");
+        jsonResult8.put("label", "液料比");
+        jsonResultArr.add(jsonResult8);
+        JSONObject jsonResult9 = new JSONObject();
+        jsonResult9.put("prop", "7");
+        jsonResult9.put("label", "球磨机号");
+        jsonResultArr.add(jsonResult9);
+
         return jsonResultArr;
     }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java

@@ -128,7 +128,7 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
 //        JSONArray jsonArr = WQL.getWO("RaUatWc_query_01").addParam("flag", "2").addParam("inspection_scheme_code",inspection_scheme_code).process().getResultJSONArray(0);
         JSONArray jsonArr = WQL.getWO("RaUatWc_query_01").addParam("flag", "5").process().getResultJSONArray(0);
         JSONArray jonsResuftArr = new JSONArray();
-        JSONObject jsonResuft1 = new JSONObject();
+/*        JSONObject jsonResuft1 = new JSONObject();
         jsonResuft1.put("prop", "1");
         jsonResuft1.put("label", "物料编码");
         JSONObject jsonResuft2 = new JSONObject();
@@ -139,14 +139,14 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
         jsonResuft3.put("label", "批号");
         JSONObject jsonResuft4 = new JSONObject();
         jsonResuft4.put("prop", "4");
-        jsonResuft4.put("label", "重量");
+        jsonResuft4.put("label", "重量");*/
         JSONObject jsonResuft5 = new JSONObject();
         jsonResuft5.put("prop", "5");
         jsonResuft5.put("label", "厂家");
-        jonsResuftArr.add(jsonResuft1);
+  /*      jonsResuftArr.add(jsonResuft1);
         jonsResuftArr.add(jsonResuft2);
         jonsResuftArr.add(jsonResuft3);
-        jonsResuftArr.add(jsonResuft4);
+        jonsResuftArr.add(jsonResuft4);*/
         jonsResuftArr.add(jsonResuft5);
         for (int i = 0; i < jsonArr.size(); i++) {
             JSONObject json = jsonArr.getJSONObject(i);

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/QP_POWDERORDERQUERY01.wql

@@ -51,11 +51,17 @@
                      work.create_time,
                      mater.material_code,
                      work.pcsn,
-                     mst.formula_id
+                     mst.formula_id,
+                     mst.ball_time,
+                     mst.product_series_id,
+                     ext.c_balance,
+                     ext.ball_rate,
+                     ext.liquid_rate
                  FROM
                       PDM_BI_WorkOrder work
                  LEFT JOIN PDM_BI_Formula mst ON mst.workorder_id = work.workorder_id
                  LEFT JOIN md_me_materialbase mater ON mater.material_id = work.material_id
+                 LEFT JOIN MD_ME_ProducMaterialExt ext ON mater.material_id = ext.material_id
 
                  WHERE
                     mst.is_delete= '0'

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog.vue

@@ -8,12 +8,13 @@
     destroy-on-close
     @close="close"
   >
-    <el-row :gutter="20">
+    <el-row :gutter="24">
-      <el-col :span="20" style="border: 1px solid white">
+      <el-col :span="18" style="border: 1px solid white">
         <span />
       </el-col>
-      <el-col :span="4">
+      <el-col :span="6">
         <span>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitAndEnd">保存并结束</el-button>
           <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">保存</el-button>
           <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
         </span>
@@ -183,6 +184,17 @@ export default {
         this.crud.toQuery()
         this.dialogVisible = false
       })
+    },
+    submitAndEnd() {
+      const data = this.form
+      if (this.form.update_optname === '') {
+        return this.crud.notify('保养人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicemaintenancemst.endMaintain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVisible = false
+        this.crud.toQuery()
+      })
     }
   }
 }

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue

@@ -0,0 +1,111 @@
+<template>
+  <el-dialog
+    title="开始维修"
+    append-to-body
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="550px"
+    destroy-on-close
+    @close="close"
+  >
+    <el-form ref="form" :inline="true" :model="form4" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="维修人" prop="update_optname">
+            <el-input v-model="form4.update_optname" style="width: 200px;" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button icon="el-icon-check" size="mini" type="primary" @click="submitResuft">保存</el-button>
+      <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+    </span>
+
+  </el-dialog>
+</template>
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
+export default {
+  name: 'StartDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form4 = this.openParam
+      }
+    }
+  },
+  data() {
+    return {
+      form4: {
+      },
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submitResuft() {
+      if (!this.form4.update_optname) {
+        return this.crud.notify('保养人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      const data = this.form4
+      crudDevicemaintenancemst.startMaintain(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVisible = false
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+
+</style>

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue

@@ -89,7 +89,7 @@
         >
           开始保养
         </el-button>
-        <el-button
+ <!--       <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -99,7 +99,7 @@
           @click="executeMaintain"
         >
           保养执行
-        </el-button>
+        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"
@@ -120,7 +120,7 @@
           :disabled="confirm_flag"
           @click="confirmMaintain"
         >
-          保养确认
+          保养验收
         </el-button>
       </crudOperation>
       <!--表格渲染-->
@@ -150,6 +150,7 @@
       <pagination />
     </div>
     <ExecuteDialog :dialog-show.sync="executeDialog" :open-param="openParam" />
+    <StartDialog :dialog-show.sync="startDialog" :open-param="openParam" />
   </div>
 </template>
 
@@ -166,11 +167,12 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import DateRangePicker from '@/components/DateRangePicker'
 import ExecuteDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog'
+import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/StartDialog'
 
 export default {
   name: 'Devicemaintenancepa',
   dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
-  components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
+  components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -199,6 +201,7 @@ export default {
       materOpt_code: '23',
       openParam: null,
       executeDialog: false,
+      startDialog: false,
       permission: {
       }
     }
@@ -262,10 +265,8 @@ export default {
       if (data.invstatus !== '02') {
         return this.crud.notify('只能对提交状态的单据开始', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      crudDevicemaintenancemst.startMaintain(data).then(res => {
+      this.openParam = data
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.startDialog = true
-        this.crud.toQuery()
-      })
     },
     endMaintain() {
       const _selectData = this.$refs.table.selection
@@ -273,10 +274,17 @@ export default {
       if (data.invstatus !== '03') {
         return this.crud.notify('只能对开始状态的单据结束', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      crudDevicemaintenancemst.endMaintain(data).then(res => {
+      crudDevicemaintenancemst.getDtl(data).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.openParam = {
-        this.crud.toQuery()
+          'form': data,
+          'tableData': res
+        }
+        this.executeDialog = true
       })
+      // crudDevicemaintenancemst.endMaintain(data).then(res => {
+      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      //   this.crud.toQuery()
+      // })
     },
     executeMaintain() {
       const _selectData = this.$refs.table.selection

mes/qd/src/views/wms/statistics/phySicalQuery/index.vue

@@ -124,7 +124,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center" />
+        <el-table-column type="index" label="序号" width="100" align="center" fixed />
+        <el-table-column prop="0" label="质检单号" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="20" label="物料名称" min-width="100" show-overflow-tooltip fixed />
         <template v-for="(col,index) in cols">
           <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
         </template>

mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue

@@ -75,7 +75,10 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center" />
+        <el-table-column type="index" label="序号" width="100" align="center" fixed />
+        <el-table-column prop="0" label="日期" min-width="150" show-overflow-tooltip fixed />
+        <el-table-column prop="1" label="产品编码" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="2" label="批号" min-width="100" show-overflow-tooltip fixed />
         <template v-for="(col,index) in cols">
           <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
         </template>

mes/qd/src/views/wms/statistics/powderProductionQuery/index.vue

@@ -57,10 +57,10 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="index" label="序号" width="100" align="center" />
-        <el-table-column prop="create_time" label="日期" width="150px" show-overflow-tooltip />
+        <el-table-column prop="create_time" label="日期" width="150px" show-overflow-tooltip fixed />
-        <el-table-column prop="workorder_code" label="工令号" width="120px" show-overflow-tooltip/>
+        <el-table-column prop="workorder_code" label="工令号" width="120px" show-overflow-tooltip fixed />
-        <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip fixed />
-        <el-table-column prop="pcsn" label="批次" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="pcsn" label="批次" min-width="150" show-overflow-tooltip fixed />
         <el-table-column prop="yl_thw" label="碳化钨" min-width="150" show-overflow-tooltip :formatter="crud.formatNum3"/>
         <el-table-column prop="yl_gf" label="钴粉" min-width="150" show-overflow-tooltip :formatter="crud.formatNum3"/>
         <el-table-column prop="yl_tf" label="碳粉" min-width="150" show-overflow-tooltip :formatter="crud.formatNum3"/>

mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue

@@ -96,7 +96,11 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" label="序号" width="100" align="center" />
+        <el-table-column type="index" label="序号" width="100" align="center" fixed />
+        <el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="2" label="物料名称" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="3" label="批号" min-width="100" show-overflow-tooltip fixed />
+        <el-table-column prop="4" label="重量" min-width="100" show-overflow-tooltip fixed />
         <template v-for="(col,index) in cols">
           <el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
         </template>

mes/qd/src/views/wms/statistics/stifleQuery/index.vue

@@ -49,11 +49,11 @@
       <crudOperation :permission="permission" />
       <!--表格渲染-->
       <el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="55" align="center" fixed />
-        <el-table-column prop="biz_date" label="日期" align="center" show-overflow-tooltip />
+        <el-table-column prop="biz_date" label="日期" align="center" show-overflow-tooltip fixed />
-        <el-table-column prop="standard_mark" label="牌号" align="center" show-overflow-tooltip />
+        <el-table-column prop="standard_mark" label="牌号" align="center" show-overflow-tooltip fixed />
-        <el-table-column prop="material_code" label="物料编码" align="center" show-overflow-tooltip />
+        <el-table-column prop="material_code" label="物料编码" align="center" show-overflow-tooltip fixed />
-        <el-table-column prop="pcsn" label="批号" align="center" show-overflow-tooltip />
+        <el-table-column prop="pcsn" label="批号" align="center" show-overflow-tooltip fixed />
         <el-table-column label="松比g/cm3" align="center">
           <el-table-column prop="sb_1" label="1" align="center" />
           <el-table-column prop="sb_2" label="2" align="center" />