From 5501a202fe36b3e5dbc3f93368fd38b3a69b31f9 Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Fri, 12 Apr 2024 17:06:31 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E9=80=81=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/ext/acs/rest/AcsToWmsController.java  |   8 ++
 .../wms/ext/acs/service/AcsToWmsService.java  |   2 +
 .../ext/acs/service/dto/ReceiveOrderReq.java  |  58 +++++++++
 .../ext/acs/service/dto/ReceiveOrderRes.java  |  23 ++++
 .../acs/service/impl/AcsToWmsServiceImpl.java |  45 +++++++
 .../src/main/java/org/nl/wms/ext/wql/ext.xls  | Bin 0 -> 53760 bytes
 .../org/nl/wms/pad/rest/PadController.java    |  12 +-
 .../org/nl/wms/pad/service/PadService.java    |   7 +-
 .../wms/pad/service/impl/PadServiceImpl.java  |  21 +++-
 .../java/org/nl/wms/sch/tasks/SendTask.java   | 110 +++++++++++++++++-
 10 files changed, 277 insertions(+), 9 deletions(-)
 create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderReq.java
 create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderRes.java
 create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls

diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
index b789bf8..c06cb71 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
@@ -50,4 +50,12 @@ public class AcsToWmsController {
     public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
     }
+
+    /*接收上游系统出库单请求*/
+    @PostMapping("/receiveOrder")
+    @Log("lms接收wms出库单")
+    @ApiOperation("lms接收wms出库单")
+    public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(acsToWmsService.receiveOrder(whereJson), HttpStatus.OK);
+    }
 }
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index a82f446..4674168 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -41,4 +41,6 @@ public interface AcsToWmsService {
      * @return JSONObject
      */
     JSONObject apply(JSONObject whereJson);
+
+    JSONObject receiveOrder(JSONObject whereJson);
 }
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderReq.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderReq.java
new file mode 100644
index 0000000..f4d4b02
--- /dev/null
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderReq.java
@@ -0,0 +1,58 @@
+package org.nl.wms.ext.acs.service.dto;
+
+import lombok.Data;
+/**
+ * 接收wms出库单请求参数
+ * @author sxp
+ */
+@Data
+public class ReceiveOrderReq {
+    //wms出库单号
+    private String deliveryno;
+    //wms出库单行号
+    private String deliverylineno;
+    //任务号
+    private String reqCode;
+    //出库单单号
+    private String orderkey;
+    //出库单行号
+    private String orderline;
+    //物料
+    private String sku;
+    //物料描述
+    private String skudesc;
+    //数量
+    private String qty;
+    //库存批
+    private String ctlCode;
+    //拣货单号
+    private String pickdetailkey;
+    //配盘单号
+    private String ppno;
+    //生产批次号
+    private String wbs;
+    //定向号
+    private String lottable09;
+    //配盘点代码
+    private String c_pp_code;
+    //配盘点描述
+    private String c_pp_name;
+    //计量单位
+    private String uom;
+    //需送货时间
+    private String scheduledshipdate;
+    //立库代码
+    private String lk_code;
+    //WMS出库时间
+    private String outboundtime;
+    //供应商名称
+    private String companyname;
+    //供应商代码
+    private String companycode;
+    //货权方
+    private String lottable06;
+    //工厂库存地
+    private String lottable02;
+    //操作人
+    private String editwho;
+}
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderRes.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderRes.java
new file mode 100644
index 0000000..a094a00
--- /dev/null
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/dto/ReceiveOrderRes.java
@@ -0,0 +1,23 @@
+package org.nl.wms.ext.acs.service.dto;
+
+import lombok.Data;
+
+/**
+ * 接收wms出库单返回参数
+ * @author sxp
+ */
+@Data
+public class ReceiveOrderRes {
+    //状态码 200
+    private int statusCode;
+    //是否成功 false\true
+    private boolean isSuccess;
+    //错误码
+    private int errCode;
+    //错误信息
+    private String message;
+    //数据
+    private String data;
+    //timestamp
+    private String timestamp;
+}
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index f1fcd59..794822c 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -420,6 +420,51 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return resuft;
     }
 
+    @Override
+    public JSONObject receiveOrder(JSONObject json) {
+        String reqCode = json.getString("reqCode");
+        String deliveryNo = json.getString("deliveryno");
+        String deliveryLineNo = json.getString("deliverylineno");
+        String sku = json.getString("sku");
+        String lkCode = json.getString("lkCode");
+        String pickDetailKey = json.getString("pickdetailkey");
+        String qty = json.getString("qty");
+        String outboundTime = json.getString("outboundtime");
+        WQLObject noteTab = WQLObject.getWQLObject("ext_delivery_note");//上游系统出库单表
+        JSONObject orderJson = new JSONObject();
+        JSONObject res = new JSONObject();
+        res.put("timestamp", DateUtil.now());
+        res.put("data", null);
+        try {
+            orderJson.put("note_id", IdUtil.getSnowflake(1, 1).nextId());
+            orderJson.put("req_code", reqCode);
+            orderJson.put("deliveryno", deliveryNo);
+            orderJson.put("deliverylineno", deliveryLineNo);
+            orderJson.put("sku", sku);
+            orderJson.put("lkCode", lkCode);
+            orderJson.put("pickdetailkey", pickDetailKey);
+            orderJson.put("qty", qty);
+            orderJson.put("outboundtime", outboundTime);
+            orderJson.put("request_param", json);
+            orderJson.put("create_time", DateUtil.now());
+            res.put("statusCode", HttpStatus.OK.value());
+            res.put("isSuccess", true);
+            res.put("errCode", 0);
+            res.put("message", "");
+            orderJson.put("response_param", res);
+            noteTab.insert(orderJson);
+        } catch (Exception e) {
+            String message = ObjectUtil.isEmpty(e.getMessage())
+                    ? ((InvocationTargetException) e).getTargetException().getMessage()
+                    : e.getMessage();
+            res.put("statusCode", HttpStatus.BAD_REQUEST.value());
+            res.put("isSuccess", false);
+            res.put("errCode", HttpStatus.BAD_REQUEST.value());
+            res.put("message", message);
+        }
+        return res;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void createEmp(JSONObject json) {
         String vehicle_qty = json.getString("vehicle_qty");
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls
new file mode 100644
index 0000000000000000000000000000000000000000..4cfd4f814af8717b5a23204189d3b92bd7efa54e
GIT binary patch
literal 53760
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
V+W(qvx?tBajUM;kr~hdS{C{&&1}Fdk

literal 0
HcmV?d00001

diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java
index 3662fed..1171705 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java
@@ -211,7 +211,7 @@ public class PadController {
             return new ResponseEntity<>(resultJSON, HttpStatus.OK);
         }
 
-        return new ResponseEntity<>(padService.send(startPointCode), HttpStatus.OK);
+        return new ResponseEntity<>(padService.send(param), HttpStatus.OK);
     }
 
     /**
@@ -316,4 +316,14 @@ public class PadController {
 
         return new ResponseEntity<>(padService.p2p(startPointCode, nextPointCode), HttpStatus.OK);
     }
+
+    /**
+     * 查询出库单列表
+     */
+    @PostMapping("/getOrderList")
+    @Log("查询出库单")
+    @ApiOperation("查询出库单")
+    public ResponseEntity<JSONObject> getOrderList() {
+        return new ResponseEntity<>(padService.getOrderList(), HttpStatus.OK);
+    }
 }
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java
index a7c9274..048d61a 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java
@@ -68,10 +68,10 @@ public interface PadService {
     /**
      * 送料（确定起点）
      *
-     * @param startPointCode 起点编码
+     * @param param 起点编码、出库单ID
      * @return 提示
      */
-    JSONObject send(String startPointCode);
+    JSONObject send(JSONObject param);
 
     /**
      * 查询该区域已锁定或未锁定的排号
@@ -100,4 +100,7 @@ public interface PadService {
      * @return 提示
      */
     JSONObject p2p(String startPointCode, String nextPointCode);
+
+    JSONObject getOrderList();
+
 }
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java
index fcc66db..1c4b63b 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java
@@ -22,6 +22,7 @@ import org.nl.wms.sch.tasks.CallTask;
 import org.nl.wms.sch.tasks.P2PTask;
 import org.nl.wms.sch.tasks.SendTask;
 import org.nl.wql.WQL;
+import org.nl.wql.core.bean.ResultBean;
 import org.nl.wql.core.bean.WQLObject;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -312,18 +313,18 @@ public class PadServiceImpl implements PadService {
     /**
      * 送料（确定起点）
      *
-     * @param startPointCode 起点编码
+     * @param param 起点编码、出库单ID
      * @return 提示
      */
     @Override
-    public JSONObject send(String startPointCode) {
+    public JSONObject send(JSONObject param) {
         // 返回值
         JSONObject resultJSON = new JSONObject();
 
         // 调用送料任务类创建任务
         try {
-            JSONObject param = new JSONObject();
-            param.put("start_point_code", startPointCode);
+//            JSONObject param = new JSONObject();
+//            param.put("start_point_code", startPointCode);
             sendTask.createTask(param);
         } catch (Exception e) {
             resultJSON.put("code", "0");
@@ -457,4 +458,16 @@ public class PadServiceImpl implements PadService {
         resultJSON.put("desc", "已创建任务");
         return resultJSON;
     }
+
+    @Override
+    public JSONObject getOrderList() {
+        JSONObject res = new JSONObject();
+        JSONArray arrayList = WQLObject.getWQLObject("ext_delivery_note")
+                .query("", "create_time desc")
+                .getResultJSONArray(0);
+        res.put("code", "1");
+        res.put("desc", "查询成功");
+        res.put("result",arrayList);
+        return res;
+    }
 }
diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java
index 04b9f61..38cac16 100644
--- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java
+++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java
@@ -4,10 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.utils.SecurityUtils;
@@ -15,9 +17,15 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 徐工送料任务类
  *
@@ -146,6 +154,48 @@ public class SendTask extends AbstractAcsTask {
             startPoint.put("update_optname", username);
             startPoint.put("update_time", now);
             WQLObject.getWQLObject("sch_base_point").update(startPoint);
+            //任务绑定的出库单信息
+            JSONObject taskNoteBindInfo= WQLObject.getWQLObject("ext_delivery_note_task").query("task_id = '" + taskId + "'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(taskNoteBindInfo)){
+                String noteId = taskNoteBindInfo.getString("note_id");
+                //需要返回物料单信息给上游系统
+                this.feedBackOutBoundRes(noteId);
+            }
+        }
+    }
+
+    /*反馈出库结果*/
+    private void feedBackOutBoundRes(String noteId) {
+        JSONObject deliveryNote = WQLObject
+                .getWQLObject("ext_delivery_note")
+                .query("note_id = '" + noteId + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(deliveryNote)){
+            return;
+        }
+        JSONObject material = new JSONObject();
+        material.put("rowIndex",deliveryNote.getString(""));
+        material.put("qty",deliveryNote.getString("qty"));
+        material.put("orderlineno",deliveryNote.getString("orderlineno"));
+        material.put("pickdetailkey",deliveryNote.getString("pickdetailkey"));
+        JSONArray array = new JSONArray();
+        array.add(material);
+        JSONObject param = new JSONObject();
+        param.put("reqCode",deliveryNote.getString("req_code"));
+        param.put("opNo",deliveryNote.getString("deliveryno"));
+        param.put("whseId","WMWHSE12");
+        param.put("lkCode","lk_code");
+        param.put("itemRows",array);
+        String api ="";
+        try {
+            String resultMsg = HttpRequest.post(api)
+                    .body(String.valueOf(param))
+                    .execute().body();
+            JSONObject result = JSONObject.parseObject(resultMsg);
+            log.info("上游系统反馈结果----------------+" + api + ",---" + result.toString());
+        } catch (Exception e) {
+            String msg = e.getMessage();
+            System.out.println(msg);
         }
     }
 
@@ -162,13 +212,13 @@ public class SendTask extends AbstractAcsTask {
     /**
      * 创建任务
      *
-     * @param param String start_point_code 点位编码
+     * @param param String start_point_code 点位编码 note_id 出库单号
      * @return 任务id
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String createTask(JSONObject param) {
-        String startPointCode = param.getString("start_point_code");
+        String startPointCode = param.getString("start_devicecode");
 
         // 判断点位是否存在
         JSONObject startPoint = WQLObject
@@ -188,6 +238,62 @@ public class SendTask extends AbstractAcsTask {
         if (StrUtil.equals(startPoint.getString("point_status"), "00")) {
             throw new BadRequestException("该点位是空位");
         }
+        String startReginId = startPoint.getString("region_id");
+        JSONObject startPointRegin = WQLObject
+                .getWQLObject("sch_base_region")
+                .query("region_id = '" + startReginId + "'")
+                .uniqueResult(0);
+        if (ObjectUtil.isEmpty(startPointRegin)){
+            throw new BadRequestException("起点区域为空");
+        }
+        //如果起点是原料周转区，需要根据出库单选择对应的终点
+        if ("YL".equals(startPointRegin.getString("region_code"))){
+            String noteId = param.getString("note_id");
+            String col = startPoint.getString("col");
+            String nextPointCode="";
+            if ("1".equals(col)){
+                nextPointCode = "DLZMHC01";
+            }
+            if ("2".equals(col)){
+                 nextPointCode = "DZZMHC01";
+            }
+            if ("3".equals(col)){
+                 nextPointCode = "XZZMHC01";
+            }
+            if ("7".equals(col)){
+                 nextPointCode = "XLZMHC01";
+            }
+            // 判断终点是否存在
+            JSONObject nextPoint = WQLObject
+                    .getWQLObject("sch_base_point")
+                    .query("point_code = '" + nextPointCode + "'")
+                    .uniqueResult(0);
+            if (ObjectUtil.isEmpty(nextPoint)) {
+                throw new BadRequestException("未找到终点");
+            }
+
+            // 判断终点是否可用
+            if (!"00".equals(nextPoint.getString("lock_type"))) {
+                throw new BadRequestException(startPoint.getString("point_name") + "已被锁定");
+            }
+            if (!"00".equals(nextPoint.getString("point_status"))) {
+                throw new BadRequestException("终点有货");
+            }
+            String taskTd = createTaskRelated(
+                    startPoint,
+                    nextPoint,
+                    param,
+                    SendTask.class,
+                    "02",
+                    CodeUtil.getNewCode("SEND_BILL_CODE"),
+                    "2");
+            WQLObject noteTaskTab = WQLObject.getWQLObject("ext_delivery_note_task");
+            Map<String,String> data = new HashMap<>();
+            data.put("task_id",taskTd);
+            data.put("note_id",noteId);
+            noteTaskTab.insert(data);
+            return taskTd;
+        }
 
         // 查询点位的送料区域
         String nextRegionId = startPoint.getString("next_region_id");