From ddd8ef51099d749c61d511c092754256b7eab20e Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 7 Apr 2025 15:15:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssureNotifyController.java | 12 +++++ .../entity/IssureNotifyEntity.java | 6 +++ .../orderIssure/entity/PickDetail.java | 52 +++++++++++++++++++ .../service/IssureNotifyService.java | 3 ++ .../service/impl/IssureNotifyServiceImpl.java | 27 +++++++++- 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/srq/modules/orderIssure/entity/PickDetail.java diff --git a/src/main/java/com/srq/modules/orderIssure/controller/IssureNotifyController.java b/src/main/java/com/srq/modules/orderIssure/controller/IssureNotifyController.java index ee7ccd8..04d0fc6 100644 --- a/src/main/java/com/srq/modules/orderIssure/controller/IssureNotifyController.java +++ b/src/main/java/com/srq/modules/orderIssure/controller/IssureNotifyController.java @@ -4,6 +4,7 @@ package com.srq.modules.orderIssure.controller; import com.srq.common.utils.PageUtils; import com.srq.common.utils.R; import com.srq.modules.orderIssure.entity.IssureNotifyEntity; +import com.srq.modules.orderIssure.entity.PickDetail; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import com.srq.modules.orderIssure.service.IssureNotifyService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,4 +25,15 @@ public class IssureNotifyController { PageUtils page = issureNotifyService.issueNotifyPageSearch(issureNotifyEntity); return R.ok().put("page", page); } + + /** + * 获取IFS 提货单的明细汇总列表数据 + * @param params 包含 contract(Site域),pickListNo(IFS提货单号),rmPartNo(物料编码) + * @return List + */ + @PostMapping("/pick/detail") + public R pickDetail(@RequestBody ProductionWarehousingEntity params) { + List rows = issureNotifyService.queryPickDetail(params); + return R.ok().put("rows",rows); + } } diff --git a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java index f113352..00cea62 100644 --- a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java +++ b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java @@ -11,8 +11,10 @@ package com.srq.modules.orderIssure.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.srq.common.utils.QueryPage; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -77,9 +79,13 @@ public class IssureNotifyEntity extends QueryPage implements Serializable{ @TableField(exist = false) private Date notifyDateEnd; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(exist = false) private Date needDateStart; + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @TableField(exist = false) private Date needDateEnd; diff --git a/src/main/java/com/srq/modules/orderIssure/entity/PickDetail.java b/src/main/java/com/srq/modules/orderIssure/entity/PickDetail.java new file mode 100644 index 0000000..d2c34a0 --- /dev/null +++ b/src/main/java/com/srq/modules/orderIssure/entity/PickDetail.java @@ -0,0 +1,52 @@ +package com.srq.modules.orderIssure.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import lombok.Data; + +@Data +public class PickDetail { + + private String rmPartDesc; + private String rmPartNo; + private String activitySeq; + private Integer pageSize; + private String ifsRowIdVersion; + private String empName; + private String thOrderNo; + private String startTime; + private String waivDevRejNo; + private String stockKey; + private String batchNo; + private String partFam; + private String contract; + private String engChgLevel; + private String serialNo; + private String locationNo; + /** + * 库存数量 + */ + @JSONField(name = "onhandQty") + private String onHandQty; + /** + * 库存可用数量 + */ + private String stockQty; + private String pickListNo; + private String ifsRowId; + private String needDate; + private Integer pageIndex; + /** + * 下发数量 + */ + private String issueQty; + /** + * 已下发数量 + */ + private String issuedQty; + /** + * 根据BOM计算的数量,所需数量 + */ + private String requireQty; + private String endTime; + private String status; +} diff --git a/src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java b/src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java index 3c42a06..7704054 100644 --- a/src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java +++ b/src/main/java/com/srq/modules/orderIssure/service/IssureNotifyService.java @@ -3,6 +3,7 @@ package com.srq.modules.orderIssure.service; import com.srq.common.utils.PageUtils; import com.srq.modules.orderIssure.entity.IssureNotifyEntity; +import com.srq.modules.orderIssure.entity.PickDetail; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import java.util.List; @@ -11,4 +12,6 @@ public interface IssureNotifyService { PageUtils issueNotifyPageSearch(IssureNotifyEntity issureNotifyEntity); + + List queryPickDetail(ProductionWarehousingEntity params); } diff --git a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index 7fcdc81..9406d53 100644 --- a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -3,6 +3,7 @@ package com.srq.modules.orderIssure.service.impl; import com.alibaba.fastjson.JSON; import com.srq.common.utils.PageUtils; import com.srq.modules.orderIssure.entity.IssureNotifyEntity; +import com.srq.modules.orderIssure.entity.PickDetail; import com.srq.modules.productionWarehousing.entity.ProductionWarehousingEntity; import com.srq.modules.orderIssure.mapper.IssureNotifyMapper; import com.srq.modules.orderIssure.service.IssureNotifyService; @@ -13,7 +14,9 @@ import com.srq.modules.base.utils.HttpClientUtil; import com.srq.modules.base.utils.ResponseData; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service @@ -32,7 +35,7 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { productionWarehousingEntity.setPageIndex(issureNotifyEntity.getPage()); productionWarehousingEntity.setPageSize(issureNotifyEntity.getLimit()); productionWarehousingEntity.setPickListNo(issureNotifyEntity.getIfsPickListNo()); - productionWarehousingEntity.setThOrderNo(issureNotifyEntity.getNotifyNo()); + productionWarehousingEntity.setThOrderNo(issureNotifyEntity.getThOrderNo()); String getIssureNotify = apiUrl + "/order/getPickOrders"; ResponseData getgetIssureNotifyResponse = HttpClientUtil.doPostByRawWithSRQ(getIssureNotify, @@ -64,4 +67,26 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { return new PageUtils(issureNotifyList, getgetIssureNotifyResponse.getCount(), issureNotifyEntity.getLimit(), issureNotifyEntity.getPage()); } + + @Override + public List queryPickDetail(ProductionWarehousingEntity params) { + // 域 + String site = params.getSite(); + // 提货单号 + String pickListNo = params.getIfsPickListNo(); + // 3H订单号 + String partNo = params.getPartNo(); + Map map = new HashMap<>(); + map.put("contract", site); + map.put("pickListNo", pickListNo); + map.put("rmPartNo", partNo); + String api = apiUrl + "/order/getPickOrderSummarys"; + ResponseData result = HttpClientUtil.doPostByRawWithSRQ(api,map); + if (!"200".equals(result.getCode())) { + throw new RuntimeException("获取IFS数据失败"); + } + String rows = result.getObj().toString(); +// List list = JSON.parseArray(rows, Map.class); + return JSON.parseArray(rows, PickDetail.class); + } }