添加一部分入库完成上报PMS代码

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsInComplete.java

@@ -0,0 +1,171 @@
+package com.ruoyi.quartz.domain.app;
+
+import org.apache.commons.io.input.buffer.PeekableInputStream;
+
+import java.util.List;
+
+/**
+ * PMS 入库单完成反馈
+ */
+public class PmsInComplete {
+
+    private String crmOrder;
+
+    private String sapCode;
+
+    private String createId;
+
+    private String createName;
+
+    private String deptId;
+
+    private String deptName;
+
+    private String outArea;
+
+    private String outLocation;
+
+    private String inArea;
+
+    private String inLocation;
+
+    private String allotType;
+
+    private String moveType;
+
+    private String serviceNo;
+
+    private String receiveTel;
+
+    private String receiveAddress;
+
+    private List<PmsInCompleteDetail> detailList;
+
+    public String getCrmOrder() {
+        return crmOrder;
+    }
+
+    public void setCrmOrder(String crmOrder) {
+        this.crmOrder = crmOrder;
+    }
+
+    public String getSapCode() {
+        return sapCode;
+    }
+
+    public void setSapCode(String sapCode) {
+        this.sapCode = sapCode;
+    }
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getOutArea() {
+        return outArea;
+    }
+
+    public void setOutArea(String outArea) {
+        this.outArea = outArea;
+    }
+
+    public String getOutLocation() {
+        return outLocation;
+    }
+
+    public void setOutLocation(String outLocation) {
+        this.outLocation = outLocation;
+    }
+
+    public String getInArea() {
+        return inArea;
+    }
+
+    public void setInArea(String inArea) {
+        this.inArea = inArea;
+    }
+
+    public String getInLocation() {
+        return inLocation;
+    }
+
+    public void setInLocation(String inLocation) {
+        this.inLocation = inLocation;
+    }
+
+    public String getAllotType() {
+        return allotType;
+    }
+
+    public void setAllotType(String allotType) {
+        this.allotType = allotType;
+    }
+
+    public String getMoveType() {
+        return moveType;
+    }
+
+    public void setMoveType(String moveType) {
+        this.moveType = moveType;
+    }
+
+    public String getServiceNo() {
+        return serviceNo;
+    }
+
+    public void setServiceNo(String serviceNo) {
+        this.serviceNo = serviceNo;
+    }
+
+    public String getReceiveTel() {
+        return receiveTel;
+    }
+
+    public void setReceiveTel(String receiveTel) {
+        this.receiveTel = receiveTel;
+    }
+
+    public String getReceiveAddress() {
+        return receiveAddress;
+    }
+
+    public void setReceiveAddress(String receiveAddress) {
+        this.receiveAddress = receiveAddress;
+    }
+
+    public List<PmsInCompleteDetail> getDetailList() {
+        return detailList;
+    }
+
+    public void setDetailList(List<PmsInCompleteDetail> detailList) {
+        this.detailList = detailList;
+    }
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsInCompleteDetail.java

@@ -0,0 +1,55 @@
+package com.ruoyi.quartz.domain.app;
+
+public class PmsInCompleteDetail {
+
+
+    private String materialNo;
+
+    private String materialName;
+
+    private Integer amount;
+
+    private String unit;
+
+    private String barcode;
+
+    public String getMaterialNo() {
+        return materialNo;
+    }
+
+    public void setMaterialNo(String materialNo) {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getBarcode() {
+        return barcode;
+    }
+
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+}

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -209,7 +209,14 @@ public class TaskExecutor {
                     appStock.setRemark("");
                     int insertStockResult = appStockService.insertAppStock(appStock);
                     logger.info("插入库存：{}，结果：{}", JSON.toJSONString(appStock), insertStockResult);
-                    appPendingStorageService.deleteAppPendingStorageByRecordId(pendingStorage.getRecordId()); // 删除码盘数据
+                    if(insertStockResult > 0) {
+                        appPendingStorageService.deleteAppPendingStorageByRecordId(pendingStorage.getRecordId()); // 删除码盘数据
+                        // 如果是PMS入库则发送PMS入库完成
+                        if(pendingStorage.getStorageType().compareTo(2) == 0) {
+
+                        }
+                    }
+
                 }
                 AppTask updateRemark = new AppTask();
                 updateRemark.setTaskId(task.getTaskId());