From bcdd994fcbd6880d5dc75038fc674bf6ab0d1000 Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 6 Mar 2025 15:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=AE=8C?= =?UTF-8?q?=E6=88=90PMS=E8=AF=B7=E6=B1=82=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quartz/domain/app/PmsOutFeedBack.java | 8 +++--- .../com/ruoyi/quartz/task/TaskExecutor.java | 26 +++++++++++-------- .../java/com/ruoyi/app/domain/AppStock.java | 10 +++++++ .../resources/mapper/app/AppStockMapper.xml | 8 +++++- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsOutFeedBack.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsOutFeedBack.java index 1805933e..ae4c2d27 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsOutFeedBack.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/PmsOutFeedBack.java @@ -1,17 +1,19 @@ package com.ruoyi.quartz.domain.app; +import java.util.List; + /** * PMS 出库反馈接口 */ public class PmsOutFeedBack { - private PmsOutFeedBackRecordList recordList; + private List recordList; - public PmsOutFeedBackRecordList getRecordList() { + public List getRecordList() { return recordList; } - public void setRecordList(PmsOutFeedBackRecordList recordList) { + public void setRecordList(List recordList) { this.recordList = recordList; } } diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index def435be..9dc34b54 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -202,7 +202,8 @@ public class TaskExecutor { for (AppPendingStorage pendingStorage : appPendingStorages) { // 插入库存 AppStock appStock = new AppStock(); - appStock.setStockId(pendingStorage.getListId()); + appStock.setStockId(IdUtils.fastSimpleUUID()); + appStock.setListId(pendingStorage.getListId()); appStock.setVehicleId(pendingStorage.getVehicleNo()); appStock.setLocationId(task.getDestination()); appStock.setGoodsId(pendingStorage.getGoodsId()); @@ -231,10 +232,10 @@ public class TaskExecutor { PmsInComplete pmsInComplete = new PmsInComplete(); pmsInComplete.setCrmOrder(pendingStorage.getListId()); pmsInComplete.setSapCode("2290"); - pmsInComplete.setInArea(""); - pmsInComplete.setInLocation(""); - pmsInComplete.setOutArea(""); - pmsInComplete.setOutLocation(""); + pmsInComplete.setInArea("TPLK"); + pmsInComplete.setInLocation("6001"); + pmsInComplete.setOutArea("TPHC"); + pmsInComplete.setOutLocation("6001"); pmsInFeedBack.setHeaderInfo(pmsInComplete); List pmsInCompleteDetails = new ArrayList<>(); PmsInCompleteDetail pmsInCompleteDetail = new PmsInCompleteDetail(); @@ -306,16 +307,19 @@ public class TaskExecutor { } // 调用 pms 接口 PmsOutFeedBack pmsOutFeedBack = new PmsOutFeedBack(); - PmsOutFeedBackRecordList recordList = new PmsOutFeedBackRecordList(); - recordList.setAmount(task.getOpNum().intValue()); - recordList.setBusinessOrder(task.getOrderId()); - recordList.setMaterialsNo(task.getGoodsId()); + PmsOutFeedBackRecordList recordListItem = new PmsOutFeedBackRecordList(); + recordListItem.setAmount(task.getOpNum().intValue()); + recordListItem.setBusinessOrder(task.getOrderId()); + recordListItem.setMaterialsNo(task.getGoodsId()); + List recordList = new ArrayList<>(); + recordList.add(recordListItem); + pmsOutFeedBack.setRecordList(recordList); String url = sysConfigService.selectConfigByKey("pms.outComplete"); if (StringUtils.isEmpty(url)) { continue; } - PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendHttpPostWithoutToken(url, JSON.toJSONString(recordList)), PmsCommonRes.class); - logger.info("pms出库反馈请求信息：{}，结果：{}", JSON.toJSONString(recordList), JSON.toJSONString(pmsCommonRes)); + PmsCommonRes pmsCommonRes = JSON.parseObject(HttpUtils.sendHttpPostWithoutToken(url, JSON.toJSONString(pmsOutFeedBack)), PmsCommonRes.class); + logger.info("pms出库反馈请求信息：{}，结果：{}", JSON.toJSONString(pmsOutFeedBack), JSON.toJSONString(pmsCommonRes)); } AppStock appStockCheck = new AppStock(); appStockCheck.setLocationId(task.getOrigin()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStock.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStock.java index 5630f779..2d0cf90a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStock.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppStock.java @@ -21,6 +21,16 @@ public class AppStock extends BaseEntity /** 物料编号 */ private String stockId; + private String listId; + + public String getListId() { + return listId; + } + + public void setListId(String listId) { + this.listId = listId; + } + /** 载具号 */ @Excel(name = "载具号") private String vehicleId; diff --git a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml index 0afb6d74..4c7c4207 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml @@ -6,6 +6,7 @@ + @@ -35,13 +36,14 @@ - select stock_id, vehicle_id, location_id, goods_id, goods_name, goods_unit, provider_id, provider_name, remain_num, origin_num, batch_no, inv_age, goods_status, stock_status, create_time, create_user, last_update_time, last_update_user, remark , + select stock_id, list_id, vehicle_id, location_id, goods_id, goods_name, goods_unit, provider_id, provider_name, remain_num, origin_num, batch_no, inv_age, goods_status, stock_status, create_time, create_user, last_update_time, last_update_user, remark , ware_date, storage_mode,storage_id, area_id, goods_type_id, occupy_num, packing_num, production_date from app_stock