From daac5618fc2322620a82d25603c5b4d15465c5ef Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 三月 2026 08:04:21 +0800
Subject: [PATCH] #检验流程
---
src/main/java/com/zy/asrs/controller/OrderController.java | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 382 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 57d3894..906b901 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -7,13 +7,14 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+
+import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +30,18 @@
private OrderDetlService orderDetlService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -37,10 +50,27 @@
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("doc_type", 1).eq("status", 1);
+ wrapper.le("settle", 2).eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
- return R.ok().add(orders);
+ // 淇濈暀鍑哄簱鍗�
+ if (!Cools.isEmpty(orders)) {
+ Iterator<Order> iterator = orders.iterator();
+ while (iterator.hasNext()) {
+ Order order = iterator.next();
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null) {
+ if (docType.getPakout() == 0) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ R r = R.ok();
+ r.put("data", orders);
+ return r;
}
@RequestMapping(value = "/order/head/page/auth")
@@ -54,7 +84,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
@@ -63,16 +93,204 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ R r = R.ok();
+ r.put("data",orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ return r;
+ }
+
+ @RequestMapping(value = "/order/inspect/list/auth")
+ @ManagerAuth
+ public R inspectList(@RequestParam(required = false) String orderNo){
+ // 1. 鏌ユ壘鍖呭惈鈥滄楠屸�濇垨鈥淚nspection鈥濈殑 DocType IDs
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>()
+ .like("doc_name", "妫�楠�")
+ .or()
+ .like("doc_name", "Inspection"));
+
+ if (Cools.isEmpty(docTypes)) {
+ R r = R.ok();
+ r.put("data", new ArrayList<>());
+ return r;
+ }
+
+ List<Long> docTypeIds = new ArrayList<>();
+ for (DocType dt : docTypes) {
+ docTypeIds.add(dt.getDocId());
+ }
+
+ // 2. 鏌ユ壘瀵瑰簲绫诲瀷鐨勮鍗�
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.in("doc_type", docTypeIds);
+ wrapper.le("settle", 2); // 寰呭鐞嗘垨澶勭悊涓�
+ wrapper.eq("status", 1);
+ wrapper.orderBy("create_time", false);
+
+ List<Order> orders = orderService.selectList(wrapper);
+ R r = R.ok();
+ r.put("data", orders);
+ return r;
+ }
+
+ @RequestMapping(value = "/order/inspection/matchingLocations/auth")
+ @ManagerAuth
+ public R queryMatchingLocations(
+ @RequestParam(required = false) String poNumber,
+ @RequestParam(required = false) String style,
+ @RequestParam(required = false) String color,
+ @RequestParam(required = false) Integer cartonNumberFrom,
+ @RequestParam(required = false) Integer cartonNumberTo) {
+ if(Cools.isEmpty(poNumber)){
+ return R.error("response.poNumber_no_exists");
+ }
+
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(poNumber)) {
+ wrapper.eq("sku", poNumber);
+ }
+ if (!Cools.isEmpty(style)) {
+ wrapper.eq("specs", style);
+ }
+ if (!Cools.isEmpty(color)) {
+ wrapper.eq("color", color);
+ }
+ wrapper.eq("item_num",null);
+
+ List<LocDetl> all = locDetlService.selectList(wrapper);
+ List<LocDetl> list = new ArrayList<>();
+
+ if (cartonNumberFrom == null && cartonNumberTo == null) {
+ list = all;
+ } else {
+ for (LocDetl item : all) {
+ String batch = item.getBatch();
+ if (Cools.isEmpty(batch)) {
+ continue;
+ }
+ String numStr = batch.replaceAll("[^0-9]", "");
+ if (Cools.isEmpty(numStr)) {
+ continue;
+ }
+ Integer num;
+ try {
+ num = Integer.parseInt(numStr);
+ } catch (NumberFormatException e) {
+ continue;
+ }
+ if (cartonNumberFrom != null && num < cartonNumberFrom) {
+ continue;
+ }
+ if (cartonNumberTo != null && num > cartonNumberTo) {
+ continue;
+ }
+ list.add(item);
+ }
+ }
+
+ Map<String, Object> data = new HashMap<>();
+ data.put("records", list);
+ data.put("total", list.size());
+
+ return R.ok(data);
+ }
+
+ @RequestMapping(value = "/order/inspection/create/auth")
+ @ManagerAuth(memo = "response.create_inspection_order")
+ @Transactional
+ public R createInspectionOrder(@RequestBody Map<String, Object> params) {
+ String orderNo = (String) params.get("orderNo");
+ String buyerShortCode = (String) params.get("buyerShortCode");
+ List<Map<String, Object>> records = (List<Map<String, Object>>) params.get("records");
+
+ if (Cools.isEmpty(orderNo) || Cools.isEmpty(records)) {
+ return R.error("response.invalid_param");
+ }
+
+ Order orderCheck = orderService.selectByNo(orderNo);
+ if (orderCheck != null) {
+ return R.error("response.order_no_exists");
+ }
+
+ Date now = new Date();
+ Long userId = getUserId();
+
+ // 鏌ユ壘妫�楠岀被鍨嬬殑鍗曟嵁
+ DocType inspectionDocType = docTypeService.selectOne(new EntityWrapper<DocType>().like("doc_name", "妫�楠�").or().like("doc_name", "Inspection"));
+ Long docTypeId = (inspectionDocType != null) ? inspectionDocType.getDocId() : null;
+
+ // 浣跨敤涓� formAdd 鐩稿悓鐨勫畬鏁存瀯閫犲嚱鏁扮‘淇濇墍鏈夊繀瑕佸瓧娈甸兘琚垵濮嬪寲
+ Order order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ orderNo, // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docTypeId, // 鍗曟嵁绫诲瀷
+ 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,
+ "Inspection Order for Buyer: " + buyerShortCode // 澶囨敞
+ );
+
+ if (!orderService.insert(order)) {
+ throw new CoolException("response.save_order_master_failed");
+ }
+
+ // 淇濆瓨鎵�鏈夋绱㈠埌鐨勮褰曚綔涓鸿鍗曟槑缁�
+ for (Map<String, Object> record : records) {
+ OrderDetl detl = new OrderDetl();
+ detl.setOrderId(Long.valueOf(order.getId()));
+ detl.setOrderNo(order.getOrderNo());
+ detl.setMatnr((String) record.get("matnr"));
+ detl.setMaktx((String) record.get("maktx"));
+ detl.setSpecs((String) record.get("specs"));
+ detl.setColor((String) record.get("color"));
+ detl.setBatch((String) record.get("batch"));
+ detl.setAnfme(Double.valueOf(String.valueOf(record.get("anfme"))));
+ detl.setSku((String) record.get("sku"));
+ detl.setOrigin((String) record.get("zpallet"));
+ detl.setBarcode((String) record.get("barcode"));
+ detl.setManu((String) record.get("manu"));
+ detl.setManuDate((String) record.get("manuDate"));
+
+ detl.setWorkQty(0.0);
+ detl.setQty(0.0);
+ detl.setStatus(1);
+ detl.setCreateBy(userId);
+ detl.setCreateTime(now);
+ detl.setUpdateBy(userId);
+ detl.setUpdateTime(now);
+
+ if (!orderDetlService.insert(detl)) {
+ throw new CoolException("response.save_order_detail_failed");
+ }
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", detl.getOrigin()).eq("batch",detl.getBatch()));
+ if (locDetl != null) {
+ if (!locDetlService.updateInspectNumber(detl.getOrigin(),detl.getBatch(),detl.getOrderNo())) {
+ throw new CoolException("response.save_order_detail_failed");
+ }
+ }
+ }
+
+ return R.ok("response.order_add_success");
}
@RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
+ @ManagerAuth(memo = "response.manual_add_order")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
+ if(Cools.isEmpty(param.getOrderNo())){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getDocType());
+ if(!Cools.isEmpty(docType)){
+ prefix = docType.getPakin() == 1 ? "RK" : "CK";
+ }
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ }
Order order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
- return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ return R.error("response.order_no_exists");
}
Date now = new Date();
order = new Order(
@@ -112,16 +330,16 @@
null // 澶囨敞
);
if (!orderService.insert(order)) {
- throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ throw new CoolException("response.save_order_master_failed");
}
List<DetlDto> list = new ArrayList<>();
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.getBarcode());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
} else {
list.add(dto);
@@ -134,20 +352,20 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
}
}
- return R.ok("璁㈠崟娣诲姞鎴愬姛");
+ return R.ok("response.order_add_success");
}
@RequestMapping(value = "/order/form/modify/auth")
- @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+ @ManagerAuth(memo = "response.manual_modify_order")
@Transactional
public R formModify(@RequestBody OrderDomainParam param){
Order order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
- return R.error("璁㈠崟涓嶅瓨鍦�");
+ return R.error("response.order_not_exist");
}
Date now = new Date();
Long userId = getUserId();
@@ -157,24 +375,24 @@
order.setUpdateBy(userId);
order.setUpdateTime(now);
if (!orderService.updateById(order)) {
- throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+ throw new CoolException("response.modify_order_type_failed");
}
}
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 1.娓呯┖鏄庣粏妗�
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ throw new CoolException("response.clear_order_detail_failed");
}
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
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.getBarcode());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
} else {
list.add(dto);
@@ -187,16 +405,88 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
}
}
- return R.ok("璁㈠崟淇敼鎴愬姛");
+ return R.ok("response.order_modify_success");
}
+ @PostMapping(value = "/order/wrk/trace/auth")
+ @ManagerAuth
+ public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
+ Order order = orderService.selectById(orderId);
+ if (null == order) {
+ return R.error("response.order_not_exist");
+ }
+ // 鏁伴噺缁熻
+ double totalQty = 0;
+ double wrkQty = 0;
+ double lackQty = 0;
+ double endQty = 0;
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+ totalQty = totalQty + orderDetl.getAnfme();
+ wrkQty = wrkQty + orderDetl.getWorkQty();
+ endQty = endQty + orderDetl.getQty();
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued > 0.0) {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ }
+ if (issued > 0.0) {
+ lackQty = lackQty + issued;
+ }
+ }
+ // 浠诲姟杩芥函
+ List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+ if (wrkMast == null) {
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+ if (wrkMastLog.getIoType()==103){
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ }
+ if (wrkMastLog != null) {
+ wrkMast = new WrkMast();
+ BeanUtils.copyProperties(wrkMastLog, wrkMast);
+ } else {
+ continue;
+ }
+ }
+ boolean exist = false;
+ for (WrkTraceVo vo : wrkTraceVos) {
+ if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
+ vo.getWrkDetls().add(wrkDetl);
+ exist = true;
+ }
+ }
+ if (!exist) {
+ WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
+ wrkTraceVos.add(vo);
+ }
+ }
+ if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
+ wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
+ }
-
-
+ R r = R.ok();
+ r.put("data", Cools
+ .add("list", wrkTraceVos)
+ .add("orderNo", order.getOrderNo())
+ .add("totalQty", totalQty)
+ .add("wrkQty", wrkQty+endQty)
+ .add("lackQty", lackQty)
+ .add("endQty",endQty));
+ return r;
+ }
// ------------------------------------------------------------------------------------------------
@@ -234,19 +524,55 @@
}
}
+ @RequestMapping(value = "/order/update/auth")
+ @ManagerAuth
+ public R update(Order order){
+ if (Cools.isEmpty(order) || null == order.getId()){
+ return R.error();
+ }
+
+ //璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
+ if(order.getSettle() == 4){
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (wrkCount > 0 || pakinCount > 0) {
+ throw new CoolException("response.existing_working_data_cannot_complete");
+ }
+ }
+
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("response.modify_order_failed");
+ }
+ return R.ok("response.order_update_success");
+ }
+
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @ManagerAuth(memo = "response.manual_delete_order")
@Transactional
public R delete(@RequestParam Long orderId){
Order order = orderService.selectById(orderId);
if (order != null) {
- order.setStatus(0);
+ DocType docType = docTypeService.selectById(order.getDocType());
+ String docName = docType != null ? String.valueOf(docType.getDocName()) : "";
+ if (!Cools.isEmpty(docName)) {
+ String dn = docName.toLowerCase();
+ if (dn.contains("inspection") || dn.contains("妫�楠�")) {
+ locDetlService.clearInspectNumberByOrderNo(order.getOrderNo());
+ }
+ }
}
- if (!orderService.updateById(order)) {
- throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
- }
- orderDetlService.modifyStatus(orderId, 0);
- return R.ok();
+ 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("response.order_delete_success");
}
@RequestMapping(value = "/order/export/auth")
@@ -281,9 +607,32 @@
public R query(@RequestBody JSONObject param) {
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(Order.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
+ @RequestMapping(value = "/order/checkInspection/auth")
+ @ManagerAuth
+ @Transactional
+ public R checkInspection(@RequestParam String orderNo, Integer inspectNumber) {
+ if (orderNo == null || orderNo.isEmpty()) {
+ return R.error("response.order_no_is_empty");
+ }
+
+ // 1. 鏇存柊搴撳瓨鏄庣粏涓殑妫�楠岀姸鎬�
+ locDetlService.updateInspectionStatus(orderNo, inspectNumber);
+
+ // 2. 鏇存柊鍗曟嵁涓绘。鐘舵�佷负宸插畬鎴� (settle = 4)
+ Order order = orderService.selectByNo(orderNo);
+ if (order != null) {
+ order.setSettle(4L);
+ orderService.updateById(order);
+ }
+
+ return R.ok("response.operation_success");
+ }
+
}
--
Gitblit v1.9.1