From bf48bb954387fecf011de9aa365d1710b85f16d9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 16 七月 2025 15:07:06 +0800
Subject: [PATCH] #
---
/dev/null | 8 --------
src/main/java/com/zy/nc/entity/NccSaleDbddWms.java | 1 -
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 40 +++++++++++++++++++++++++---------------
src/main/java/com/zy/nc/vo/IaIjBillB.java | 11 ++++++-----
4 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 4c21f9d..c9e5522 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -441,26 +441,36 @@
private Object processDBDD(List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
- IaIjBill iaIjBill = new IaIjBill();
- iaIjBill.setPk_org("FYT");
- //iaIjBill.setCwarehouseid("6101");
- IaIjBillB iaIjBillB = null;
- List<IaIjBillB> iaIjBillBS = new ArrayList<>();
+
+ String hid = "";
+ List<IaIjBillB> bids = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- iaIjBillB = new IaIjBillB();
+ if (orderDetl.getQty() <= 0) {
+ continue;
+ }
+ IaIjBillB iaIjBillB = new IaIjBillB();
String remark = orderDetl.getRemark();
if (!Cools.isEmpty(remark)) {
- NccSaleDbddWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
- iaIjBillB.setCinventoryid(nccSaleXsfhmxWms.getWlbm());
- iaIjBillB.setCinventoryvid(nccSaleXsfhmxWms.getWlbm());
- iaIjBillB.setCsrcid(nccSaleXsfhmxWms.getCbillid());
- iaIjBillB.setNnum(orderDetl.getQty().intValue() + "");
- iaIjBillB.setPk_org("FYT");
+ NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetl.getBatch()).eq("wlbm", orderDetl.getMatnr()));
+ if (nccScPcdaWms == null) {
+ throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetl.getBatch() + orderDetl.getMatnr());
+ }
+
+ Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getQty());
+ NccSaleDbddWms nccSaleDbddWms = JSONObject.parseObject(remark, NccSaleDbddWms.class);
+ iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
+ iaIjBillB.setNassistnum(weight);
+ iaIjBillB.setNnum(orderDetl.getQty());
+ iaIjBillB.setVbatchcode(orderDetl.getBatch());
+ iaIjBillB.setClocationid("");
+ iaIjBillB.setCstateid(nccScPcdaWms.getVcode());
+
+ hid = nccSaleDbddWms.getCbillid();
}
- iaIjBillBS.add(iaIjBillB);
+ bids.add(iaIjBillB);
}
- data.put("ia_ijbill", iaIjBill);
- data.put("ia_ijbill_b", iaIjBillBS);
+ data.put("hid", hid);
+ data.put("bids", bids);
return data;
}
diff --git a/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
index 77e3553..af7aaa8 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
@@ -1,6 +1,5 @@
package com.zy.nc.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import java.math.BigDecimal;
diff --git a/src/main/java/com/zy/nc/vo/IaIjBill.java b/src/main/java/com/zy/nc/vo/IaIjBill.java
deleted file mode 100644
index 4c66758..0000000
--- a/src/main/java/com/zy/nc/vo/IaIjBill.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.nc.vo;
-
-import lombok.Data;
-
-@Data
-public class IaIjBill {
- private String pk_org;
-}
diff --git a/src/main/java/com/zy/nc/vo/IaIjBillB.java b/src/main/java/com/zy/nc/vo/IaIjBillB.java
index 14d413a..7679d67 100644
--- a/src/main/java/com/zy/nc/vo/IaIjBillB.java
+++ b/src/main/java/com/zy/nc/vo/IaIjBillB.java
@@ -4,9 +4,10 @@
@Data
public class IaIjBillB {
- private String csrcid;
- private String cinventoryid;
- private String nnum;
- private String cinventoryvid;
- private String pk_org;
+ private String bid;
+ private Double nassistnum;
+ private Double nnum;
+ private String vbatchcode;
+ private String clocationid;
+ private String cstateid;
}
--
Gitblit v1.9.1