From 5d6c45fda93e4f80334213205ca5aec4e10436b2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 21:21:47 +0800
Subject: [PATCH] 关闭与erp的对接
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2
src/main/java/com/zy/nc/vo/ic_generalout_b.java | 12 +
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 40 +++---
src/main/java/com/zy/nc/entity/NccScPcdaWms.java | 42 +++++++
src/main/java/com/zy/nc/mapper/NccScPcdaWmsMapper.java | 18 +++
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 28 ++--
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 32 ++++-
src/main/resources/mapper/nc/NccScPcdaWmsMapper.xml | 19 +++
src/main/java/com/zy/nc/task/PlanOrderTask.java | 6 +
src/main/java/com/zy/asrs/entity/StoreType.java | 14 ++
src/main/java/com/zy/nc/service/NccScPcdaWmsService.java | 13 ++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 65 ++++++----
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 3
src/main/java/com/zy/nc/service/impl/NccScPcdaWmsServiceImpl.java | 22 +++
14 files changed, 248 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 2404729..141a825 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -133,7 +133,7 @@
null, // 瀹㈡埛缂栧彿
null, // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ getUser().getUsername(), // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
diff --git a/src/main/java/com/zy/asrs/entity/StoreType.java b/src/main/java/com/zy/asrs/entity/StoreType.java
index 99578f1..01a1885 100644
--- a/src/main/java/com/zy/asrs/entity/StoreType.java
+++ b/src/main/java/com/zy/asrs/entity/StoreType.java
@@ -33,6 +33,20 @@
private String storeName;
/**
+ * 閮ㄩ棬
+ */
+ @ApiModelProperty(value = "閮ㄩ棬")
+ @TableField("department")
+ private String department;
+
+ /**
+ * 閮ㄩ棬id
+ */
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableField("department_id")
+ private String departmentId;
+
+ /**
* 鏄惁绔嬪簱鏈韩
*/
@ApiModelProperty(value = "鏄惁绔嬪簱鏈韩锛�0涓嶆槸锛�1鏄�")
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index e0544d6..eb578f8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -31,7 +31,10 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderDetlPakoutService orderDetlService;
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -80,10 +83,10 @@
}
}
if (complete) {
-// // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
+ // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
// DocType docType = docTypeService.selectById(order.getDocType());
-// if (null != docType && docType.getPakout() == 1&& docType.getDocName().equals("閿�鍞彂璐�")) {
-// if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
+// if (null != docType && docType.getPakout() == 1 && docType.getDocName().equals("閿�鍞彂璐�")) {
+// if (!orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
// }
// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
@@ -98,12 +101,12 @@
// orderDetl.setCreateBy(order.getCreateBy());
// orderDetl.setUpdateTime(order.getUpdateTime());
// orderDetl.setUpdateBy(order.getUpdateBy());
-// if (!orderDetlService.insert(orderDetl)) {
+// if (!orderDetlPakoutService.insert(orderDetl)) {
// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
// }
+//
// }
// }
-
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -116,7 +119,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -146,13 +149,13 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlPakoutService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlPakoutService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -168,7 +171,7 @@
if (!this.deleteById(orderId)) {
throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
}
- orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
}
@Override
@@ -195,6 +198,7 @@
public OrderPakout selectOrderMoveStatus() {
return this.baseMapper.selectOrderMoveStatus();
}
+
@Override
public OrderPakout selectOrderMoveStatusInitial() {
return this.baseMapper.selectOrderMoveStatusInitial();
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 b00c233..187179f 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -3,19 +3,20 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.StoreType;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.ReportToThirdService;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.nc.SendUtil;
-import com.zy.nc.entity.NccCgCgdhdWms;
-import com.zy.nc.entity.NccSaleDbddWms;
-import com.zy.nc.entity.NccSaleXsfhmxWms;
-import com.zy.nc.entity.NccScZkmxbWms;
+import com.zy.nc.entity.*;
+import com.zy.nc.service.NccScPcdaWmsService;
import com.zy.nc.util.NcResultMessage;
import com.zy.nc.vo.*;
import lombok.extern.slf4j.Slf4j;
@@ -37,6 +38,12 @@
@Autowired
private OrderService orderService;
+
+ @Autowired
+ private StoreTypeService storeTypeService;
+
+ @Autowired
+ private NccScPcdaWmsService nccScPcdaWmsService;
@Value("${NYNC.ip}")
private String nyncIp;
@@ -121,7 +128,7 @@
break;
case "杞簱-鍑哄簱":
if (step == 1) {
- process2 = processGENERALOUT2(orderDetls, memo);
+ process2 = processGENERALOUT2(orderDetls, order.getOperMemb(), order.getItemId(), memo);
List<Object> zkck2 = new ArrayList<>();
zkck2.add(process2);
//鍙戦�佽姹�
@@ -143,7 +150,7 @@
log.info("杞簱-鍑哄簱1response:{}", response);
memo = response.getData().toString();
- process2 = processGENERALOUT2(orderDetls, memo);
+ process2 = processGENERALOUT2(orderDetls, order.getOperMemb(), order.getItemId(), memo);
List<Object> zkck2 = new ArrayList<>();
zkck2.add(process2);
//鍙戦�佽姹�
@@ -377,7 +384,7 @@
* @param orderDetls
* @return
*/
- private Object processGENERALOUT2(List<OrderDetl> orderDetls, String memo) {
+ private Object processGENERALOUT2(List<OrderDetl> orderDetls, String renyuan, String rukucangku, String memo) {
Object o = JSONObject.parseArray(memo).get(0);
JSONObject jsonObject = JSONObject.parseObject(o.toString());
String cspecialhid = JSONObject.parseObject(jsonObject.getString("ic.WhsTransBillHeaderVO")).getString("cspecialhid");
@@ -395,12 +402,23 @@
ic_generalout_b generalout_b = null;
List<ic_generalout_b> ic_purchasein_bs = new ArrayList<>();
for (int i = 0; i < orderDetls.size(); i++) {
+ NccScPcdaWms nccScPcdaWms = nccScPcdaWmsService.selectOne(new EntityWrapper<NccScPcdaWms>().eq("vbatchcode", orderDetls.get(i).getBatch()).eq("wlbm", orderDetls.get(i).getMatnr()));
+ if (nccScPcdaWms == null) {
+ throw new CoolException("鎵规[{}]鐗╂枡[{}]鏈壘鍒�" + orderDetls.get(i).getBatch() + orderDetls.get(i).getMatnr());
+ }
OrderDetl orderDetl = orderDetls.get(i);
generalout_b = new ic_generalout_b();
generalout_b.setCsourcebillbid(s.get(i));
generalout_b.setCsourcetype("4K-01");
generalout_b.setCsourcebillhid(cspecialhid);
generalout_b.setCmaterialvid(orderDetl.getMatnr());
+ generalout_b.setCstateid(nccScPcdaWms.getVcode());
+ StoreType storeType = storeTypeService.selectOne(new EntityWrapper<StoreType>().eq("store_id", orderDetl.getStandby1()));
+ generalout_b.setCdptvid(storeType.getDepartmentId());
+ generalout_b.setBillmaker(renyuan);
+ StoreType storeType2 = storeTypeService.selectOne(new EntityWrapper<StoreType>().eq("store_id", rukucangku));
+ generalout_b.setCotherwhid(rukucangku);
+ generalout_b.setCothercalbodyvid(storeType2.getDepartmentId());
generalout_b.setNshouldassistnum(orderDetl.getQty());
generalout_b.setVbatchcode(orderDetl.getBatch());
ic_purchasein_bs.add(generalout_b);
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 21de429..988ca1f 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -94,24 +94,6 @@
@Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrderInAndOutUtil() {
-// String erpReport = Parameter.get().getErpReport();
-// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = OrderInAndOutUtil.selectComplete(null);
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
- } catch (Exception e) {
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
- }
-// }
- }
-
//@Scheduled(cron = "0/5 * * * * ? ")
//@Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil2() {
@@ -132,6 +114,28 @@
// }
}
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReportOrderInAndOutUtil() {
+// String erpReport = Parameter.get().getErpReport();
+// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ }
+// }
+ }
+
+
+
@Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 86490b6..ef443d8 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -33,6 +33,10 @@
private OrderDetlService orderDetlService;
@Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Autowired
@@ -89,8 +93,7 @@
List<OrderDetl> orderDetlList = new ArrayList<>();
for (OrderDetl detail : orderDetls) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(),
- detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
@@ -121,9 +124,9 @@
if (null == docType) {
return SUCCESS;
}
-// if (docType.getDocName().equals("閿�鍞彂璐�")) {
-// return SUCCESS;
-// }
+ if (docType.getDocName().equals("閿�鍞彂璐�")) {
+ return SUCCESS;
+ }
Order orderSou = orderService.selectByNo(order.getOrderNo());
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
@@ -137,29 +140,15 @@
if (orderDetl.getQty().equals(0D)) {
continue;
}
- if (!Cools.isEmpty(orderDetlSou.getBatch())){
- if (orderDetlSou.beSimilar(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
- orderDetl.setQty(0D);
- }
- }
- }else {
- if (orderDetlSou.beSimilar2(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
- orderDetl.setQty(0D);
- }
+ if (orderDetlSou.beSimilar(orderDetl)) {
+ double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+ orderDetlSou.setQty(orderDetlSou.getAnfme());
+ orderDetl.setQty(orderDetl.getQty() - v);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+ orderDetl.setQty(0D);
}
}
}
@@ -199,6 +188,26 @@
}
}
if (complete) {
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(wrkDetl.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setStatus(1);
+ orderDetl.setCreateTime(order.getCreateTime());
+ orderDetl.setCreateBy(order.getCreateBy());
+ orderDetl.setUpdateTime(order.getUpdateTime());
+ orderDetl.setUpdateBy(order.getUpdateBy());
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+
// 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
diff --git a/src/main/java/com/zy/nc/entity/NccScPcdaWms.java b/src/main/java/com/zy/nc/entity/NccScPcdaWms.java
new file mode 100644
index 0000000..c338433
--- /dev/null
+++ b/src/main/java/com/zy/nc/entity/NccScPcdaWms.java
@@ -0,0 +1,42 @@
+package com.zy.nc.entity;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+/**
+ *
+ * @TableName ncc_sc_pcda_wms
+ */
+@TableName(value ="ncc_sc_pcda_wms")
+@Data
+public class NccScPcdaWms {
+ /**
+ *
+ */
+ private String vcode;
+
+ /**
+ *
+ */
+ private String vname;
+
+ /**
+ *
+ */
+ private String pkBatchcode;
+
+ /**
+ *
+ */
+ private String vbatchcode;
+
+ /**
+ *
+ */
+ private String wlbm;
+
+ /**
+ *
+ */
+ private String ts;
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/nc/mapper/NccScPcdaWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccScPcdaWmsMapper.java
new file mode 100644
index 0000000..a399713
--- /dev/null
+++ b/src/main/java/com/zy/nc/mapper/NccScPcdaWmsMapper.java
@@ -0,0 +1,18 @@
+package com.zy.nc.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccScPcdaWms;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sc_pcda_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-06-04 16:01:00
+* @Entity com.zy.nc.entity.NccScPcdaWms
+*/
+public interface NccScPcdaWmsMapper extends BaseMapper<NccScPcdaWms> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/zy/nc/service/NccScPcdaWmsService.java b/src/main/java/com/zy/nc/service/NccScPcdaWmsService.java
new file mode 100644
index 0000000..6fefee1
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/NccScPcdaWmsService.java
@@ -0,0 +1,13 @@
+package com.zy.nc.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.nc.entity.NccScPcdaWms;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sc_pcda_wms銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2025-06-04 16:01:00
+*/
+public interface NccScPcdaWmsService extends IService<NccScPcdaWms> {
+
+}
diff --git a/src/main/java/com/zy/nc/service/impl/NccScPcdaWmsServiceImpl.java b/src/main/java/com/zy/nc/service/impl/NccScPcdaWmsServiceImpl.java
new file mode 100644
index 0000000..e997b7b
--- /dev/null
+++ b/src/main/java/com/zy/nc/service/impl/NccScPcdaWmsServiceImpl.java
@@ -0,0 +1,22 @@
+package com.zy.nc.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.nc.entity.NccScPcdaWms;
+import com.zy.nc.service.NccScPcdaWmsService;
+import com.zy.nc.mapper.NccScPcdaWmsMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author zc857
+* @description 閽堝琛ㄣ�恘cc_sc_pcda_wms銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-06-04 16:01:00
+*/
+@Service
+public class NccScPcdaWmsServiceImpl extends ServiceImpl<NccScPcdaWmsMapper, NccScPcdaWms>
+ implements NccScPcdaWmsService{
+
+}
+
+
+
+
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 7ebebd2..f874839 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -57,6 +57,7 @@
if (!returnT.isSuccess()) {
for (NccSaleXsfhmxWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleXsfhmxWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -89,6 +90,7 @@
if (!returnT.isSuccess()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -114,6 +116,7 @@
if (!returnT.isSuccess()) {
for (NccScZkmxbWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccScZkmxbWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -138,6 +141,7 @@
if (!returnT.isSuccess()) {
for (NccCgCgdhdWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccCgCgdhdWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -164,6 +168,7 @@
if (!returnT.isSuccess()) {
for (NccSaleDbddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccSaleDbddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
@@ -187,6 +192,7 @@
if (!returnT.isSuccess()) {
for (NccCkPddWms wms : wmsFlag) {
wms.setWmsMemo(returnT.getMsg());
+ wms.setWmsFlag(0);
nccCkPddWmsService.updateById(wms);
}
log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index 2ac629b..4dfdfb1 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -152,9 +152,12 @@
storeType.setStoreId(nccJcCkWms.getCode());
storeType.setCreateBy(1L);
storeType.setCreateTime(new Date());
+ storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
+ //storeType.setDepartment();
storeTypeService.insert(storeType);
} else {
storeType.setStoreName(nccJcCkWms.getName());
+ storeType.setDepartmentId((Cools.isEmpty(nccJcCkWms.getDef3()) || "~".equals(nccJcCkWms.getDef3())) ? null : nccJcCkWms.getDef3());
storeTypeService.updateById(storeType);
}
nccJcCkWms.setWmsFlag(1);
diff --git a/src/main/java/com/zy/nc/vo/ic_generalout_b.java b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
index d8ec03f..23f16d2 100644
--- a/src/main/java/com/zy/nc/vo/ic_generalout_b.java
+++ b/src/main/java/com/zy/nc/vo/ic_generalout_b.java
@@ -15,9 +15,17 @@
private String csourcebillbid;
- private String csourcetype;
+ private String csourcetype;
- private String csourcebillhid;
+ private String csourcebillhid;
+ private String cstateid;
+ private String cdptvid;
+
+ private String billmaker;
+
+ private String cotherwhid;
+
+ private String cothercalbodyvid;
}
diff --git a/src/main/resources/mapper/nc/NccScPcdaWmsMapper.xml b/src/main/resources/mapper/nc/NccScPcdaWmsMapper.xml
new file mode 100644
index 0000000..8464f85
--- /dev/null
+++ b/src/main/resources/mapper/nc/NccScPcdaWmsMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.nc.mapper.NccScPcdaWmsMapper">
+
+ <resultMap id="BaseResultMap" type="com.zy.nc.entity.NccScPcdaWms">
+ <result property="vcode" column="VCODE" />
+ <result property="vname" column="VNAME" />
+ <result property="pkBatchcode" column="PK_BATCHCODE" />
+ <result property="vbatchcode" column="VBATCHCODE" />
+ <result property="wlbm" column="WLBM" />
+ <result property="ts" column="TS" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ VCODE,VNAME,PK_BATCHCODE,VBATCHCODE,WLBM,TS
+ </sql>
+</mapper>
--
Gitblit v1.9.1