修改bug

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java

@@ -98,27 +98,35 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_WorkOrder"); // 工艺路线主表
         String material_id = json.getString("material_id");
         String pcsn = json.getString("pcsn");
-        JSONObject old = mstTab.query("status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0);
+        int pcsn_num = json.getInteger("pcsn_num");
-        if(old!=null){
+        if(pcsn_num>=1){
-            throw new BadRequestException("已存在相同产品和批次的未完成工令！");
+            for(int i=0;i<pcsn_num;i++){
+                JSONObject jo = this.createPcsn(json);
+                pcsn = jo.getString("pcsn");
+                JSONObject old = mstTab.query("status<>'99' and material_id='"+material_id+"' and pcsn='"+pcsn+"'").uniqueResult(0);
+                if(old!=null){
+                    throw new BadRequestException("已存在相同产品和批次的未完成工令！");
+                }
+                json.put("pcsn", pcsn);
+                String product_series_id = json.getString("product_series_id");
+                if (StrUtil.isEmpty(product_series_id)) {
+                    throw new BadRequestException("工令对应产品系列不能为空！");
+                }
+                // 插入主表
+                json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
+                json.put("workordercard_id",json.getString("workorder_id"));
+                String workorder_code = CodeUtil.getNewCode("GL_CODE");
+                json.put("workorder_code", workorder_code);
+                json.put("is_delete", "0");
+                json.put("create_id", currentUserId);
+                json.put("create_name", nickName);
+                json.put("create_time", now);
+                json.put("sysdeptid", deptId);
+                json.put("syscompanyid", deptId);
+                mstTab.insert(json);
+                this.updatePcsn(json);
+            }
         }
-        String product_series_id = json.getString("product_series_id");
-        if (StrUtil.isEmpty(product_series_id)) {
-            throw new BadRequestException("工令对应产品系列不能为空！");
-        }
-        // 插入主表
-        json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
-        json.put("workordercard_id",json.getString("workorder_id"));
-        String workorder_code = CodeUtil.getNewCode("GL_CODE");
-        json.put("workorder_code", workorder_code);
-        json.put("is_delete", "0");
-        json.put("create_id", currentUserId);
-        json.put("create_name", nickName);
-        json.put("create_time", now);
-        json.put("sysdeptid", deptId);
-        json.put("syscompanyid", deptId);
-        mstTab.insert(json);
-        this.updatePcsn(json);
     }
 
     @Override
@@ -147,7 +155,16 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
         whereJson.put("update_time", now);
         whereJson.put("sysdeptid", deptId);
         whereJson.put("syscompanyid", deptId);
+
+        JSONObject old2 = mstTab.query("workorder_id='"+workorder_id+"'").uniqueResult(0);
+        if(old2!=null){
+           String pcsn_old = old2.getString("pcsn");
+           if(!pcsn_old.equals("pcsn")){
+               this.updatePcsn(whereJson);
+           }
+        }
         mstTab.update(whereJson);
+
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_SHUTFRAME.wql

@@ -64,13 +64,19 @@
 		PAGEQUERY
 			SELECT
                     ShutFrame.shutframeinv_id AS id,
-                    ShutFrame.*,
+                    ShutFrame.*
-                    mb.material_code,
-                    mb.material_name
                 FROM
                     ST_IVT_ShutFrameInv ShutFrame
-                LEFT JOIN ST_IVT_ShutFrameDtl ShutFrameDtl ON ShutFrameDtl.shutframeinv_id = ShutFrame.shutframeinv_id
+                inner join (SELECT
-                LEFT JOIN md_me_materialbase mb ON mb.material_id = ShutFrameDtl.material_id
+                        ShutFrameDtl.shutframeinv_id
+                    FROM
+                        ST_IVT_ShutFrameDtl ShutFrameDtl
+                    LEFT JOIN md_me_materialbase mb ON mb.material_id = ShutFrameDtl.material_id
+                    where 1=1
+                   OPTION 输入.material_code <> ""
+                          (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
+                   ENDOPTION
+                    group by shutframeinv_id) dtlcopy on dtlcopy.shutframeinv_id = ShutFrame.shutframeinv_id
                 WHERE
                     1 = 1
                 AND ShutFrame.is_delete = '0'
@@ -99,9 +105,6 @@
                OPTION 输入.end_time <> ""
                    ShutFrame.input_time <= 输入.end_time
                ENDOPTION
-               OPTION 输入.material_code <> ""
-                   (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code)
-              ENDOPTION
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue

@@ -6,7 +6,7 @@
     :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
     @close="close"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="105px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
       <el-form-item label="工令号" prop="workorder_code">
         <label slot="label">工&nbsp;&nbsp;令&nbsp;号:</label>
         <el-input v-model="form.workorder_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -96,6 +96,17 @@
           <el-button slot="append" icon="el-icon-search" @click="queryDtl" />
         </el-input>
       </el-form-item>
+      <el-form-item label="批数" prop="pcsn_num">
+        <label slot="label">批数:</label>
+        <el-input-number
+          v-model="form.pcsn_num"
+          :controls="false"
+          :precision="0"
+          :min="1"
+          v-show="crud.status.add  === 1"
+          style="width: 210px"
+        />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model="form.remark" style="width: 480px;" rows="3" type="textarea" :disabled="crud.status.view > 0" />
@@ -130,6 +141,7 @@ const defaultForm = {
   workorder_qty: '500',
   workorder_type: '01',
   is_experiment: '0',
+  pcsn_num: '1',
   remark: '',
   planstart_time: ''
 }

mes/qd/src/views/wms/st/inStor/shutFrame/index.vue

@@ -168,8 +168,6 @@
         <el-table-column prop="stor_name" label="仓库" width="100" />
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
         <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
-        <el-table-column show-overflow-tooltip width="135" prop="material_code" label="物料编码" />
-        <el-table-column show-overflow-tooltip width="135" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
         <el-table-column label="制单人" align="center" prop="input_optname" width="100" />
         <el-table-column show-overflow-tooltip prop="input_time" width="135" label="制单时间" />