From 93674068e900b95726ef1ab9fd4dd61b50a1cb2f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 12 六月 2024 09:56:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 7feeeba..fefdf51 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -52,6 +52,8 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -137,7 +139,9 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- docIds.add(pakin.getDocId());
+ if (pakin.getDocId() != 32) {
+ docIds.add(pakin.getDocId());
+ }
}
wrapper.in("source",docIds);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
@@ -160,6 +164,56 @@
// }
// wrapper.in("order_no",orderNos);
// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ // 鎵�鏈夊叆搴撹鍗曟槑缁�
+ @RequestMapping(value = "/order/bcp/detls/pakin/page/auth")
+ @ManagerAuth
+ public R bcpOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "100")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 32) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source",docIds);
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth")
+ @ManagerAuth
+ public R bcpDbOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "100")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 33) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source",docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(),1);
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/order/detl/all/auth")
@@ -294,7 +348,7 @@
dbList.add(dto);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setSource(param.getDocType().intValue());
+ orderDetl.setSource(33);
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
@@ -571,6 +625,7 @@
Date now = new Date();
DataFormatter dataFormatter = new DataFormatter();
for (int i = 1; i < totalRows; i++) {
+ Integer proSts = 0;
Row row = sheet.getRow(i);
//鍗曟嵁绫诲瀷
String docName = dataFormatter.formatCellValue(row.getCell(0));
@@ -587,6 +642,7 @@
continue;
}
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));
+
Mat mat = matService.selectByMatnr(matnr);
if (null == mat) {
throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
@@ -595,6 +651,26 @@
//String timeStr = DateUtils.convert(new Date());
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+
+ // 鍗曟嵁绫诲瀷涓� 鍗婃垚鍝佸叆搴撳崟鎵嶆湁宸ュ簭
+ if (docType.getDocId().intValue() == 32) {
+ //宸ュ簭
+ if (Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(6)))) {
+ // 宸ュ簭涓虹┖锛岄粯璁や负鏃犻渶鍔犲伐
+ proSts = 3;
+ } else {
+ String processSts = dataFormatter.formatCellValue(row.getCell(6));
+ //1: 寰呭姞宸� 2锛氬凡鍔犲伐 3锛氭棤闇�鍔犲伐
+ if ("寰呭姞宸�".equals(processSts)) {
+ proSts = 1;
+ } else if ("宸插姞宸�".equals(processSts)) {
+ proSts = 2;
+ } else {
+ proSts = 3;
+ }
+ }
+ }
+
if(docType.getPakin() == 1){
uuid += "_I";
@@ -665,6 +741,7 @@
orderDetl.setDeadTime(isocode);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
@@ -673,6 +750,7 @@
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
}
+ // 鐢熸垚璋冩嫧鍗�
if (docType.getDocId().intValue() == 32) {
String dbUuid = "DB" + uuid;
Order order2 = orderService.selectByNo(dbUuid);
@@ -747,6 +825,85 @@
}
}
}
+
+ // 宸ュ簭涓�1锛氬緟鍔犲伐 鐢熸垚鍔犲伐鍗�
+ if (proSts == 1) {
+ if (docType.getDocId().intValue() == 32) {
+ String dbUuid = "JG" + uuid;
+ Order order3 = orderService.selectByNo(dbUuid);
+ if (null == order3) {
+ order3 = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ dbUuid, // 璁㈠崟缂栧彿
+ null, // 鍗曟嵁鏃ユ湡
+ 35L, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order3)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }else {
+ order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
+ orderService.updateById(order3);
+ }
+
+ OrderDetl orderDetl3 = orderDetlService.selectItem(order3.getId(), matnr, null,csocode,isocode);
+ if (orderDetl3 == null) {
+ orderDetl3 = new OrderDetl();
+ orderDetl3.sync(mat);
+ orderDetl3.setSource(35);
+ orderDetl3.setBatch(null);
+ orderDetl3.setAnfme(anfme);
+ orderDetl3.setOrderId(order3.getId());
+ orderDetl3.setOrderNo(order3.getOrderNo());
+ orderDetl3.setCreateBy(userId);
+ orderDetl3.setCreateTime(now);
+ orderDetl3.setUpdateBy(userId);
+ orderDetl3.setUpdateTime(now);
+ orderDetl3.setThreeCode(csocode);
+ orderDetl3.setDeadTime(isocode);
+ orderDetl3.setStatus(1);
+ orderDetl3.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl3)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if(!orderDetlService.increaseAnfme(order3.getId(), matnr, null, anfme,csocode,isocode)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+ }
+ }
+
}
return R.ok("瀵煎叆鎴愬姛");
}
--
Gitblit v1.9.1