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>()
-                .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code")));
-        if (map==null){
-            MpsSaleOrder saleOrder = saleOrderService.getById(whereJson.getString("sale_id"));
-            map= MapOf.of("sale_code",saleOrder.getSale_code(),"material_code",whereJson.getString("material_code"),"bar_code","","print_no",0,"orderext_id","");
+        MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
+                .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code")));
+        Map result;
+        if (one==null){
+            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.setMaterial_code(whereJson.getString("material_code"));
+            one.setRemark1(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){
-            one.setOrderext_id(IdUtil.getStringId());
+        if (StringUtils.isEmpty(one.getSale_id())){
+            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", param.getJSONObject("extra_map"));
-        }
+        form.put("extra_map", JSON.parseObject(workOrder.getPackage_ext()));
         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}