From 7b3185cd8af416efdb39b063ce3cbb0e3d69b539 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 14 十二月 2022 11:19:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 155 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 141 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index 5535f7a..9d9c781 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -1,17 +1,17 @@
package com.zy.common.service.erp.task;
-import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Tag;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.TagService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.dto.VoucherDto;
import com.zy.common.service.erp.entity.Goods;
+import com.zy.common.service.erp.entity.Voucher;
+import com.zy.common.service.erp.entity.VoucherDetail;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,8 @@
import java.util.Date;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* erp浠诲姟鎺у埗鍣�
@@ -36,6 +38,14 @@
private TagService tagService;
@Autowired
private MatService matService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Scheduled(cron = "0/5 * * * * ? ")
@Synchronized
@@ -46,12 +56,12 @@
Date now = new Date();
if (!Cools.isEmpty(goods)) {
for (Goods good : goods) {
- Mat mat = matService.selectByMatnr(good.getBarCode());
+ Mat mat = matService.selectByMatnr(good.getMaterialNO());
if (mat == null) {
mat = new Mat();
mat.setTagId(top.getId());
- mat.setMatnr(good.getBarCode());
- mat.setMaktx(good.getMaterialNO());
+ mat.setMatnr(good.getMaterialNO());
+// mat.setMaktx(good.getBarCode());
mat.setSpecs(good.getProdSpec());
mat.setModel(good.getBatch());
mat.setWeight(good.getNWT());
@@ -66,12 +76,11 @@
if (!matService.insert(mat)) {
throw new CoolException(good.getBarCode() + "鍟嗗搧鍚屾澶辫触");
- } else {
- int state = 1;
- if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
- throw new CoolException(good.getBarCode() + "鍟嗗搧淇敼State涓�"+state+"澶辫触");
- }
}
+ }
+ int state = 1;
+ if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
+ throw new CoolException(good.getBarCode() + "鍟嗗搧淇敼State涓�"+state+"澶辫触");
}
}
}
@@ -82,7 +91,125 @@
@Transactional
public synchronized void syncOrder() {
List<VoucherDto> list = erpService.selectOrder(0);
- System.out.println(JSON.toJSONString(list));
+ for (VoucherDto dto : list) {
+ Voucher voucher = dto.getVoucher();
+ Order order = orderService.selectByNo(voucher.getVoucherID());
+ if (Cools.isEmpty(order)) {
+
+ String regEx = "[^0-9]";
+ Pattern compile = Pattern.compile(regEx);
+ Matcher matcher = compile.matcher(voucher.getMT());
+ String docTypeVal = matcher.replaceAll("").trim();
+
+ DocType docType = docTypeService.selectOrAdd(docTypeVal, null);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ voucher.getVoucherID(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ voucher.getBatch(), // 鍒濆绁ㄦ嵁鍙�
+ voucher.getMaterialNO(), // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ voucher.getCustomer(), // 瀹㈡埛
+ voucher.getCenterID(), // 鑱旂郴鏂瑰紡
+ voucher.getPlant(), // 鎿嶄綔浜哄憳
+ voucher.getTotalNum(), // 鍚堣閲戦 ********************
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ voucher.getLoc(), // 涓氬姟鍛�
+ voucher.getTotalCount(), // 缁撶畻澶╂暟 ********************
+ null, // 閭垂鏀粯绫诲瀷
+ voucher.getExpectedWeight(), // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+
+ Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+ if (mat == null) {
+ throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
+ }
+
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ StringBuilder sb = new StringBuilder();
+ if (!Cools.isEmpty(dto.getDetails())) {
+ for (VoucherDetail detail : dto.getDetails()) {
+ sb.append(detail.getBarcode()).append(",");
+ }
+ orderDetl.setBatch(sb.toString());
+ }
+ orderDetl.setAnfme(voucher.getExpectedWeight());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+// else {
+// for (VoucherDetail detail : dto.getDetails()) {
+//
+// Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+// if (mat == null) {
+// throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
+// }
+//
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(mat);
+//// orderDetl.setBatch(detlDto.getBatch());
+// orderDetl.setAnfme(1.0D);
+// orderDetl.setOrderId(order.getId());
+// orderDetl.setOrderNo(order.getOrderNo());
+// orderDetl.setCreateBy(9527L);
+// orderDetl.setCreateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
+// orderDetl.setStatus(1);
+// orderDetl.setQty(0.0D);
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// }
+// }
+
+ // erp 鍚屾
+ int state = 1;
+ if (!erpService.updateStateForVoucher(voucher.getVoucherID(), state)) {
+ throw new CoolException(voucher.getVoucherID() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
+ } else {
+ erpService.updateTimeForVoucherDetail(voucher.getVoucherID());
+ }
+
+ } else {
+ log.warn("{}璁㈠崟宸插瓨鍦�", voucher.getVoucherID());
+ }
+ }
}
}
--
Gitblit v1.9.1