From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderController.java | 340 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 331 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 29a40fd..a459112 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -31,7 +32,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
-import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -59,6 +59,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private FlowLogService flowLogService;
+ @Autowired
+ private ConfigService configService;
@GetMapping("/doc/type/list")
@Transactional
@@ -217,6 +219,52 @@
// return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
+ // 鍏ュ簱璁㈠崟鏄庣粏
+ @RequestMapping(value = "/order/detls/pakin/page/auth/v2")
+ @ManagerAuth
+ public R orderDetlsV2(@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);
+ Object o = param.get("orderType");
+ param.remove("orderType");
+ convert(param, wrapper);
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ if (split[0].equals("39")) {
+ //wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
+ wrapper.in("source", split);
+ List<String> m = configService.getMatCode();
+ if (!Cools.isEmpty(m)) {
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().like("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().like("matnr", m.get(i), SqlLike.RIGHT);
+ }
+ }
+ }
+ } else {
+ wrapper.in("source", split);
+ }
+ }
+
+// 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());
+// }
+// }
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+
@RequestMapping(value = "/order/detls/pakin")
@ManagerAuth
public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
@@ -271,11 +319,22 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() == 36) {
+ if (pakin.getDocId() == 36 || pakin.getDocId() == 39 || pakin.getDocId() == 19) {
docIds.add(pakin.getDocId());
}
}
wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode2();
+ if (!Cools.isEmpty(m)) {
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().like("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().like("matnr", m.get(i), SqlLike.RIGHT);
+ }
+ }
+ }
+ //wrapper.like("matnr", "50", SqlLike.RIGHT);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -320,10 +379,58 @@
docIds.add(pakin.getDocId());
}
}
+ //wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
+ //wrapper.in("source", docIds);
+
wrapper.in("source", docIds);
+ List<String> m = configService.getMatCode();
+ if (!Cools.isEmpty(m)) {
+ for (int i = 0; i < m.size(); i++) {
+ if (i == 0) {
+ wrapper.andNew().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ } else {
+ wrapper.or().notLike("matnr", m.get(i), SqlLike.RIGHT);
+ }
+ }
+ }
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/bcpDb/detls/pakin/page/auth/v2")
+ @ManagerAuth
+ public R bcpDbOrderDetlsV2(@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);
+ Object o = param.get("orderType");
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ wrapper.in("source", split);
+ param.remove("orderType");
+ }
+ 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.like("order_no", "DC", SqlLike.RIGHT);
+ // wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeDb2(record.getMatnr(), record.getThreeCode(), 1);
record.setStock(sumAnfme == null ? 0 : sumAnfme);
}
return R.ok(page);
@@ -372,6 +479,21 @@
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
Date now = new Date();
+ if (param.getDocType() == 33) {
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ boolean flag = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (orderDetl.getMatnr().startsWith(s)) {
+ flag = true;
+ }
+ }
+ if (flag) {
+ param.setOrderNo("DC" + param.getOrderNo());
+ break;
+ }
+ }
+ }
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
@@ -423,7 +545,7 @@
if (param.getDocType() != 32) {
orderDetl.setProcessSts(3);
}
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -489,9 +611,22 @@
}
}
if (param.getDocType().intValue() == 32) {
+ String ono = "DB";
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ boolean flag2 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (orderDetl.getMatnr().startsWith(s)) {
+ flag2 = true;
+ }
+ }
+ if (flag2) {
+ ono = "DC";
+ }
+ }
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- "DB" + param.getOrderNo(), // 璁㈠崟缂栧彿
+ ono + param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
33L, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
@@ -603,7 +738,7 @@
List<DetlDto> dbList = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
if (orderDetl.getProcessSts() != 1) continue;
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode().trim(), orderDetl.getProcessSts());
if (DetlDto.has(dbList, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
@@ -693,7 +828,7 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getAnfme(), orderDetl.getProcessSts());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getThreeCode(), orderDetl.getProcessSts());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getThreeCode().trim(), orderDetl.getDeadTime());
Double anfme = item.getAnfme();
@@ -879,13 +1014,17 @@
}
@RequestMapping(value = "/order/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼璁㈠崟鐘舵��")
public R update(Order order) {
if (Cools.isEmpty(order) || null == order.getId()) {
return R.error("鍙傛暟缂哄け");
}
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
+ Long settle = order.getSettle();
+ if (settle != null && settle == 6) {
+ order.setMemo(Cools.isEmpty(order.getMemo()) ? "鎵嬪姩瀹岀粨" : order.getMemo() + "鎵嬪姩瀹岀粨");
+ }
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟澶辫触");
}
@@ -1115,7 +1254,19 @@
}
// 鐢熸垚璋冩嫧鍗�
if (docType.getDocId().intValue() == 32) {
- String dbUuid = "DB" + odNo;
+ String dbUuid;
+ boolean flag3 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (matnr.startsWith(s)) {
+ flag3 = true;
+ }
+ }
+ if (!Cools.isEmpty(matnr) && flag3) {
+ dbUuid = "DC" + odNo;
+ } else {
+ dbUuid = "DB" + odNo;
+ }
Order order2 = orderService.selectByNo(dbUuid);
if (null == order2) {
order2 = new Order(
@@ -1320,6 +1471,177 @@
}
+ /**
+ * excel瀵煎叆
+ */
+ @PostMapping(value = "/order/excel/import3/auth")
+ @ManagerAuth(memo = "鍗曟嵁Excel瀵煎叆")
+ @Transactional
+ public R cstmrExcelImport3(MultipartFile file) throws IOException {
+ InputStream inStream = file.getInputStream();
+ String fileMime = file.getContentType();
+ int excelVersion = 2007;
+ if ("application/vnd.ms-excel".equals(fileMime)) {
+ excelVersion = 2003;
+ }
+ Workbook book = null;
+ try {
+ if (excelVersion == 2003) {
+ book = new HSSFWorkbook(inStream);
+ } else { // 褰� excel 鏄� 2007 鏃�
+ book = new XSSFWorkbook(inStream);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return R.error("瀵煎叆鏂囦欢鏍煎紡閿欒锛岃浣跨敤xls鍚庣紑鐨勬枃浠讹紒");
+ }
+
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ Long userId = getUserId();
+ 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)).trim();
+ //鍗曟嵁缂栧彿
+ String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim();
+ //鐗╂枡鍙�
+ String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim();
+ //閿�鍞崟鍙�
+ String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim();
+ //鑷敱椤�
+ String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim();
+ // 鏁伴噺
+ if (Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))) {
+ continue;
+ }
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));
+
+ Mat mat = matService.selectByMatnr(matnr);
+ if (null == mat) {
+ throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+
+ String odNo = uuid;
+ if (docType.getPakin() == 1) {
+ odNo += "_I";
+ } else {
+ odNo += "_O";
+ }
+ if (docName.contains("璋冩嫧鍗�")) {
+ boolean flag6 = false;
+ List<String> matCode = configService.getMatCode();
+ for (String s : matCode) {
+ if (matnr.startsWith(s)) {
+ flag6 = true;
+ }
+ }
+ if (!Cools.isEmpty(matnr) && flag6) {
+ odNo = "DC" + odNo;
+ } else {
+ odNo = "DB" + odNo;
+ }
+ //odNo = "DB" + odNo;
+ } else if (docName.contains("鍔犲伐鍗�")) {
+ odNo = "JG" + odNo;
+ } else {
+ if (docType.getPakin() == 1) {
+ odNo += "_I";
+ } else {
+ odNo += "_O";
+ }
+ }
+ Date date = new Date();
+ Order order = orderService.selectByNo(odNo);
+ if (null == order) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ odNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(date), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ 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(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ // 鏈夊師璁㈠崟鍦ㄧ殑鎯呭喌
+ DocType orderType = docTypeService.selectById(order.getDocType());
+ if (!orderType.getDocName().equals(docName)) {
+ throw new CoolException("鏂拌鍗曪細" + uuid + " 涓庣郴缁熷唴鐨勮鍗曞彿鐩稿悓锛屽崟鎹被鍨嬩笉鍚屻�傝纭鏂拌鍗曞崟鎹被鍨嬶紒");
+ }
+ order.setSettle(order.getSettle() == 1L ? 1L : 2L);
+ orderService.updateById(order);
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null, csocode, isocode);
+ if (orderDetl == null) {
+ orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setSource(docType.getDocId().intValue());
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(anfme);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setThreeCode(csocode);
+ orderDetl.setDeadTime(isocode);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setProcessSts(proSts);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if (anfme < 0) {
+ throw new CoolException("璁㈠崟鏁伴噺涓嶅厑璁镐负璐熸暟锛�");
+ }
+ if (!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme, csocode, isocode)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
+
// @RequestMapping(value = "/order/sync")
// @Transactional
// public R sync() {
--
Gitblit v1.9.1