add:修改老车间工单打印

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java

@@ -23,36 +23,18 @@ public class MpsSaleOrderIcExt implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
-    @TableId(value = "orderext_id")
-    private String orderext_id;
     /**
      * 销售单标识
      */
+    @TableId(value = "sale_id")
     private String sale_id;
 
-    /**
-     * 销售单编号
-     */
-    private String sale_code;
 
     /**
      * 明细序号
      */
     private Integer seq_no;
 
-    /**
-     * print_序号
-     */
-    private Integer print_no;
-
-    /**
-     * 物料规格
-     */
-    private String material_code;
-
     /**
      * 包装袋类型
      */

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java

@@ -3,6 +3,7 @@ package org.nl.wms.mps_manage.saleorder.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.anno.Log;
 import org.nl.common.utils.IdUtil;
@@ -55,13 +56,16 @@ public class MpsSaleOrderIcExtController {
     @Log("新增订单扩展表")
     //("新增订单扩展表")
     public ResponseEntity<Object> query(@RequestBody JSONObject whereJson) {
-        Map<String, Object> map = extService.getMap(new QueryWrapper<MpsSaleOrderIcExt>()
+        MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
-                .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code")));
+                .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code")));
-        if (map==null){
+        Map result;
-            MpsSaleOrder saleOrder = saleOrderService.getById(whereJson.getString("sale_id"));
+        if (one==null){
-            map= MapOf.of("sale_code",saleOrder.getSale_code(),"material_code",whereJson.getString("material_code"),"bar_code","","print_no",0,"orderext_id","");
+            String bar_code = whereJson.getString("workorder_code") + whereJson.getString("is_flip") + whereJson.getString("target_roadway") + "00001";
+            result = MapOf.of("sale_id",whereJson.getString("sale_id"),"material_code",whereJson.getString("material_code"),"bar_code",bar_code,"print_no",0);
+        }else {
+            result = MapOf.of("sale_id",one.getSale_id(),"material_code",one.getRemark1(),"bar_code",one.getBar_code(),"print_no",one.getRemark2());
         }
-        return new ResponseEntity<>(map,HttpStatus.OK);
+        return new ResponseEntity<>(result,HttpStatus.OK);
     }
 
     @PostMapping("/getExtList")
@@ -71,14 +75,13 @@ public class MpsSaleOrderIcExtController {
         if (StringUtils.isEmpty(whereJson.getString("sale_id"))){throw new BadRequestException("当前工单没有绑定订单无法打印");};
         if (whereJson.getInteger("print_num")==null){throw new BadRequestException("没有设置打印标签数量");};
         MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
-                .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code")));
+                .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code")));
         int print_no = 0;
         if (one==null){
             one = new MpsSaleOrderIcExt();
-            one.setSale_id(whereJson.getString("sale_id"));
+            one.setRemark1(whereJson.getString("material_code"));
-            one.setMaterial_code(whereJson.getString("material_code"));
         }else {
-            print_no = one.getPrint_no();
+            print_no = Integer.parseInt(one.getRemark2());
         }
         LinkedList<String> barCodes = new LinkedList<>();
         for (int i =0;i<whereJson.getInteger("print_num");i++){
@@ -86,16 +89,34 @@ public class MpsSaleOrderIcExtController {
             barCodes.add(bar_code);
         }
 
-        one.setPrint_no(print_no+whereJson.getInteger("print_num"));
+        one.setRemark2(String.valueOf(print_no+whereJson.getInteger("print_num")));
         one.setBar_code(barCodes.getLast());
-        if (one.getOrderext_id() == null){
+        if (StringUtils.isEmpty(one.getSale_id())){
-            one.setOrderext_id(IdUtil.getStringId());
+            one.setSale_id(whereJson.getString("sale_id"));
+            one.setSeq_no(1);
             extService.save(one);
         }else {
-            extService.updateById(one);
+            extService.update(new UpdateWrapper<MpsSaleOrderIcExt>()
+                    .set("remark2",one.getRemark2())
+                    .set("bar_code",one.getBar_code())
+                    .eq("sale_id", whereJson.getString("sale_id"))
+                    .eq("remark1", whereJson.getString("material_code")));
         }
         return new ResponseEntity<>(barCodes,HttpStatus.OK);
     }
 
+    @PostMapping("/reset")
+    @Log("根据工单获取条码")
+    //("根据工单获取条码")
+    public ResponseEntity<Object> reset(@RequestBody JSONObject whereJson) {
+        if (StringUtils.isEmpty(whereJson.getString("sale_id"))||StringUtils.isEmpty(whereJson.getString("material_code"))) {
+            throw new BadRequestException("请求参数不能为空，缺少sale_id或者物料信息");
+        };
+        extService.remove(new QueryWrapper<MpsSaleOrderIcExt>()
+                .eq("sale_id", whereJson.getString("sale_id"))
+                .eq("remark1", whereJson.getString("material_code")));
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
 }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java

@@ -38,7 +38,7 @@ public class MpsSaleOrder implements Serializable{
       * 明细序号
       */
 
-     private Integer seq_no;
+     private int seq_no;
      /**
       * 销售单类型
       */

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java

@@ -1048,9 +1048,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         form.put("device_code", workOrder.getDevice_code());
         form.put("is_needmove", workOrder.getIs_needmove() ? 1 : 0);
         form.put("package_ext", workOrder.getPackage_ext());
-        if (param.containsKey("extra_map")) {
+        form.put("extra_map", JSON.parseObject(workOrder.getPackage_ext()));
-            form.put("extra_map", param.getJSONObject("extra_map"));
-        }
         return form;
     }
 

mes/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -7,7 +7,7 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
 #     url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:zjhl_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:Root.123456}

mes/qd/src/views/wms/old_manage/old_package/index.vue

@@ -91,16 +91,16 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <!--        <el-button-->
-          slot="right"
+        <!--          slot="right"-->
-          class="filter-item"
+        <!--          class="filter-item"-->
-          type="success"
+        <!--          type="success"-->
-          size="mini"
+        <!--          size="mini"-->
-          icon="el-icon-check"
+        <!--          icon="el-icon-check"-->
-          @click="save"
+        <!--          @click="save"-->
-        >
+        <!--        >-->
-          保存
+        <!--          保存-->
-        </el-button>
+        <!--        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"
@@ -276,7 +276,7 @@
         <el-card class="box-card" shadow="never">
           <el-form ref="form" :inline="true" :model="form" size="mini" label-width="160px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
             <el-form-item label="订单号" prop="pwd">
-        <el-input v-model="printForm.sale_code" disabled type="text" style="width: 200px" />
+              <el-input v-model="printForm.sale_id" disabled type="text" style="width: 200px" />
             </el-form-item>
             <el-form-item label="物料编号" prop="pwd">
               <el-input v-model="printForm.material_code" disabled type="text" style="width: 200px" />
@@ -289,7 +289,7 @@
               <el-button type="primary" @click="resetno">重置箱号</el-button>
             </el-form-item>
             <el-form-item label="打印标签数量" prop="pwd">
-        <el-input-number v-model="printForm.print_number" type="text" style="width: 100px" />
+              <el-input-number v-model="printForm.print_num" type="text" style="width: 100px" />
             </el-form-item>
           </el-form>
         </el-card>
@@ -311,8 +311,8 @@
         @select-all="onSelectAll"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/>
         <el-table-column prop="workorder_code" label="工单编号" width="140px" />
+        <el-table-column prop="sale_id" label="订单号" width="140px" />
         <el-table-column prop="shift_type_scode" label="班次类型">
           <template slot-scope="scope">
             {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
@@ -493,8 +493,16 @@ export default {
       val[1] = form.sect_id
       form.cascader = val
     },
-    submit() {},
+    submit() {
-    resetno() {},
+      this.printNumber()
+    },
+    resetno() {
+      const param = { 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
+      orderExt.reset(param).then(res => {
+        this.crud.notify('重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVisible = false
+      })
+    },
     handleSelectionChange(val, row) {
       if (val.length > 1) {
         this.$refs.table.clearSelection()
@@ -536,17 +544,6 @@ export default {
       return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
     },
     startWork() {
-      if (!this.crud.query.one_box_package_qty || !this.crud.query.one_package_qty || !this.crud.query.box_type ||
-        !this.crud.query.target_roadway || !this.crud.query.is_flip ||
-        !this.crud.query.tray_full_num) {
-        this.crud.notify('缺少开工必要参数，保证输入框内不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.currentRow.extra_map = this.crud.query
-      this.currentRow.extra_map.package_qty = Math.ceil(this.currentRow.plan_qty / this.currentRow.extra_map.one_package_qty)
-      this.currentRow.extra_map.box_num = Math.ceil(this.currentRow.extra_map.package_qty / this.currentRow.extra_map.one_box_package_qty)
-      orderExt.add(this.currentRow).then(res => {
-      })
       crudProduceshiftorder.openStart(this.currentRow).then(res => {
       })
       this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -585,7 +582,11 @@ export default {
       })
     },
     printFormm() {
-      const param ={"sale_id":this.currentRow.sale_id,"material_code":this.currentRow.material_code}
+      const parse = JSON.parse(this.currentRow.package_ext)
+      const flip = parse.is_flip
+      const target_roadway = parse.target_roadway
+      const workorderCode = this.currentRow.workorder_code
+      const param = { 'workorder_code': workorderCode, 'is_flip': flip, 'target_roadway': target_roadway, 'sale_id': this.currentRow.sale_id, 'material_code': this.currentRow.material_code }
       orderExt.getQuery(param).then(res => {
         this.printForm = res
       })
@@ -598,6 +599,11 @@ export default {
       this.dialogVisible = true
     },
     printNumber() {
+      const parse = JSON.parse(this.currentRow.package_ext)
+
+      this.currentRow.print_num = this.printForm.print_num
+      this.currentRow.is_flip = parse.is_flip
+      this.currentRow.target_roadway = parse.target_roadway
       orderExt.getExtList(this.currentRow).then(res => {
         if (res.length == 0 || !res) {
           this.crud.notify('该工单需要打印的箱数为0', CRUD.NOTIFICATION_TYPE.INFO)

mes/qd/src/views/wms/old_manage/old_package/orderExt.js

@@ -22,6 +22,12 @@ export function getQuery(data) {
     method: 'post',
     data
   })
+} export function reset(data) {
+  return request({
+    url: 'api/mpsSaleOrderIcExt/reset',
+    method: 'post',
+    data
+  })
 }
 
-export default { add, getExtList, getQuery }
+export default { add, getExtList, getQuery, reset }