From 111a3de74141c30848099480dc079bdb58ed7d7b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 08 四月 2024 21:19:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 129 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 9cf0b36..11b9ac2 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -98,6 +98,54 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
+ // 鎵�鏈夊叆搴撹鍗�
+ @RequestMapping(value = "/order/detls/in/page/auth")
+ @ManagerAuth
+ public R orderIn(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10000")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("settle").orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ docIds.add(pakin.getDocId());
+ }
+ wrapper.in("doc_type",docIds);
+ return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ // 鎵�鏈夊叆搴撹鍗曟槑缁�
+ @RequestMapping(value = "/order/detls/pakin/page/auth")
+ @ManagerAuth
+ public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10000")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);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("settle").orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ docIds.add(pakin.getDocId());
+ }
+ wrapper.in("doc_type",docIds);
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
@@ -156,7 +204,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -209,7 +257,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -356,14 +404,14 @@
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
-// Order order = orderService.selectById(orderId);
-// if (order != null) {
-// order.setStatus(0);
-// }
-// if (!orderService.updateById(order)) {
-// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
-// }
-// orderDetlService.modifyStatus(orderId, 0);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/report/auth")
+ @ManagerAuth(memo = "鎵嬪姩涓婁紶璁㈠崟")
+ @Transactional
+ public R report(@RequestParam Long orderId){
+ orderService.report(orderId,getUser().getUsername());
return R.ok();
}
@@ -439,30 +487,34 @@
DataFormatter dataFormatter = new DataFormatter();
for (int i = 1; i < totalRows; i++) {
Row row = sheet.getRow(i);
- // 璁㈠崟缂栧彿
- String uuid = dataFormatter.formatCellValue(row.getCell(0));
- // 鍟嗗搧鍚嶇О
- String maktx = dataFormatter.formatCellValue(row.getCell(1));
- // 鍟嗗搧缂栫爜
+ //鍗曟嵁绫诲瀷
+ String docName = dataFormatter.formatCellValue(row.getCell(0));
+ //鍗曟嵁缂栧彿
+ String uuid = dataFormatter.formatCellValue(row.getCell(1));
+ //鐗╂枡鍙�
String matnr = dataFormatter.formatCellValue(row.getCell(2));
+ //閿�鍞崟鍙�
+ String csocode = dataFormatter.formatCellValue(row.getCell(3));
+ //鑷敱椤�
+ String isocode = dataFormatter.formatCellValue(row.getCell(4));
// 鏁伴噺
- Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
- // 涓嬪崟鏃堕棿
- String timeStr = dataFormatter.formatCellValue(row.getCell(4));
- Date time = null;
- try {
- time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
- } catch (Exception e) {
- throw new CoolException("绗�" + i + "琛屼笅鐨勯偅鏃堕棿瑙ｆ瀽澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ if(Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))){
+ continue;
}
- // 鍟嗗搧绯诲垪
- String tagName = dataFormatter.formatCellValue(row.getCell(5));
- // 瑙勬牸
- String specs = dataFormatter.formatCellValue(row.getCell(6));
-
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));
Mat mat = matService.selectByMatnr(matnr);
if (null == mat) {
throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+
+ //String timeStr = DateUtils.convert(new Date());
+
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+
+ if(docType.getPakin() == 1){
+ uuid += "_I";
+ }else {
+ uuid += "_O";
}
Order order = orderService.selectByNo(uuid);
@@ -470,8 +522,8 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
uuid, // 璁㈠崟缂栧彿
- timeStr, // 鍗曟嵁鏃ユ湡
- 14L, // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
@@ -497,18 +549,21 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
+ userId, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null // 澶囨敞
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
+ }else {
+ order.setSettle(order.getSettle() == 1L ? 1L : 2L );
+ orderService.updateById(order);
}
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null);
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null,csocode,isocode);
if (orderDetl == null) {
orderDetl = new OrderDetl();
orderDetl.sync(mat);
@@ -516,17 +571,19 @@
orderDetl.setAnfme(anfme);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateBy(userId);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
+ orderDetl.setThreeCode(csocode);
+ orderDetl.setDeadTime(isocode);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
} else {
- if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme)) {
+ if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme,csocode,isocode)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
}
--
Gitblit v1.9.1