From e216da700e6907bdb4052ce2dda6670cec307e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 20 Dec 2024 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=A1=E6=A0=B8=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=202.=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/zyjh/ZyjhController.java     | 13 ++++++++-----
 .../com/dsic/gj_erp/controller/zyjh/dto/PgDto.java |  1 +
 .../dsic/gj_erp/controller/zyjh/dto/ShangLiao.java |  1 +
 .../service/jhgk/impl/DmSygdMxServiceImpl.java     | 14 +++++++++-----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index 207191a..5518728 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -267,7 +267,7 @@ public class ZyjhController {
                 Message result = Message.result(webSocketService.getErpId(), "1");
                 webSocketService.sendMessage(result.toString());
             }
-
+            this.sendSuccessTips(dto.getDeviceId());
             return new ResultBean<>();
         } catch (NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
@@ -339,7 +339,7 @@ public class ZyjhController {
             zyjhService.updateBatchById(list);
 
 
-
+            this.sendSuccessTips(dto.getDeviceId());
             return new ResultBean<>();
         } catch (NoSuchFieldException | IllegalAccessException e) {
             throw new ServiceException(10001,"属性字段不存在");
@@ -451,8 +451,6 @@ public class ZyjhController {
         //更新月度计划上料相关字段
         zyjhService.updateForSl(sl);
 
-        //todo 更新库存信息
-
         switch (sl.getType()){
             case YCL:
                 wsHandler.sendSlComplete((JSONObject)JSONObject.toJSON(info));
@@ -461,7 +459,7 @@ public class ZyjhController {
                 wsHandler.sendLLComplete((JSONObject)JSONObject.toJSON(info));
                 break;
         }
-
+        this.sendSuccessTips(sl.getDeviceId());
         return new ResultBean<>();
     }
 
@@ -496,8 +494,13 @@ public class ZyjhController {
         wsHandler.tip(msg.toJson());
         if (msg.getCode()==3000){
             wsHandler.zyjhzx(msg.toJson());
+            //this.sendSuccessTips();
         }
+
         return new ResultBean<>();
     }
 
+    private void sendSuccessTips(String deviceId){
+        wsHandler.tip((JSONObject) JSONObject.toJSON(new ResultBean<>(deviceId)));
+    }
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
index 3306171..e3e58bb 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
@@ -16,6 +16,7 @@ public class PgDto {
     private List<DmYdjh> list;
     private String zt;
     private Boolean audioFlag=false;
+    private String deviceId;
 
     private YcldwInfo ycldwInfo;
 }
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
index ff39fd9..d0089ee 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/ShangLiao.java
@@ -34,6 +34,7 @@ public class ShangLiao {
     private String qgjhrq;
     private String bfr;//摆放人
     private Ycldw.DwTypeEnum type;//垛位类型
+    private String deviceId;
 
     public boolean checkCkwp(){
         return ObjUtil.isNotEmpty(this.ckwpkwp);
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index bb08547..46ea9f9 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -116,15 +116,19 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             Map<String, List<DmYdjh>> map = dmYdjhs.stream().collect(Collectors.groupingBy(it -> it.getDcCh() + "_" + it.getDcPl()));
             map.forEach((key,val)->{
                 String plXh = this.getPlGdh();
-                val.forEach(item-> item.setPlxh(plXh));
+                val.forEach(item-> {
+                    item.setPlxh(plXh);
+                    item.setGxsj(gxsj);
+                });
             });
 
             //工单号
-            List<DmYdjh> updateList = dmYdjhs.stream()
-                    .filter(item->StrUtil.isNotEmpty(item.getSljhrq()))
-                    .map(item->ofXf(item,gxsj)).collect(Collectors.toList());
+            //此处取消工单号生成功能,改为图纸打印时生成,基础数据导入时同步到作业计划
+//            List<DmYdjh> updateList = dmYdjhs.stream()
+//                    .filter(item->StrUtil.isNotEmpty(item.getSljhrq()))
+//                    .map(item->ofXf(item,gxsj)).collect(Collectors.toList());
 
-            ydjhService.updateBatchById(updateList);
+            ydjhService.updateBatchById(dmYdjhs);
         }
     }