From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/controller/OrderController.java | 366 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 322 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 93a9a57..3d7fac7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,16 +8,27 @@
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.param.InitOrderParam;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OrderDomainParam;
+
+import com.zy.asrs.entity.result.WrkTraceVo;
+import com.zy.asrs.importexcle.ImportOrderDto;
+import com.zy.asrs.importexcle.ImportOrderListener;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.FileSaveExampleUtil;
+import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
+import java.io.IOException;
import java.util.*;
@RestController
@@ -29,6 +40,97 @@
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;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
+ @PostMapping("/importOrder")
+ @ManagerAuth(memo = "鍗曟嵁瀵煎叆")
+ @ApiOperation(value = "鍗曟嵁瀵煎叆", produces = MediaType.APPLICATION_JSON_VALUE)
+ public R importOrderData(@RequestParam("file") MultipartFile multipartFile) {
+ try {
+ importOrder(multipartFile);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error(e.getMessage());
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void importOrder(MultipartFile multipartFile) throws IOException {
+ // 鑰冩牳鏁版嵁鐨勫垽閲嶄娇鐢╫rder_id,check_type鐨勭粍鍚堝敮涓�绱㈠紩瑙ｅ喅
+ EasyExcel.read(multipartFile.getInputStream(), ImportOrderDto.class,
+ new ImportOrderListener(orderService, orderDetlMapper,docTypeService, snowflakeIdWorker,getUserId())).sheet().doReadSync();
+ }
+
+ @RequestMapping(value = "/order/nav/list/auth")
+ @ManagerAuth
+ public R navList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("status", 1).ne("doc_type",25);
+ wrapper.orderBy("create_time", false);
+ List<Order> orders = orderService.selectList(wrapper);
+ // 淇濈暀鍑哄簱鍗�
+ 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();
+ }
+ }
+ }
+ }
+ }
+ return R.ok().add(orders);
+ }
+
+ @RequestMapping(value = "/order/nav/listMes/auth")
+ @ManagerAuth
+ public R navListMes(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("status", 0).eq("doc_type", 25);
+ wrapper.orderBy("create_time", false);
+ List<Order> orders = orderService.selectList(wrapper);
+// // 淇濈暀鍑哄簱鍗�
+// 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();
+// }
+// }
+// }
+// }
+// }
+ return R.ok().add(orders);
+ }
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
@@ -41,8 +143,9 @@
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));
}
@@ -53,9 +156,17 @@
}
@RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody InitOrderParam param){
+ 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("鍗曟嵁缂栧彿宸插瓨鍦�");
@@ -100,34 +211,159 @@
if (!orderService.insert(order)) {
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
+ List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- orderDetl.setOrderId(order.getId());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
}
}
return R.ok("璁㈠崟娣诲姞鎴愬姛");
}
@RequestMapping(value = "/order/form/modify/auth")
- @ManagerAuth
- public R formModify(@RequestBody InitOrderParam param){
- System.out.println(JSON.toJSONString(param));
- return R.ok();
+ @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+ @Transactional
+ public R formModify(@RequestBody OrderDomainParam param){
+ Order order = orderService.selectById(param.getOrderId());
+ if (order == null || order.getStatus() == 0) {
+ return R.error("璁㈠崟涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ Long userId = getUserId();
+ // 淇敼涓绘。
+ if (!param.getDocType().equals(order.getDocType())) {
+ order.setDocType(param.getDocType());
+ order.setUpdateBy(userId);
+ order.setUpdateTime(now);
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+ }
+ }
+ // 淇敼鏄庣粏妗�
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ // 1.娓呯┖鏄庣粏妗�
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ }
+ // 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());
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return R.ok("璁㈠崟淇敼鎴愬姛");
}
-
-
-
-
-
-
-
+ @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("鍗曟嵁涓嶅瓨鍦�");
+ }
+ // 鏁伴噺缁熻
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+ double totalQty = 0;
+ double wrkQty = 0;
+ double lackQty = 0;
+ double endQty = 0;
+ 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()));
+ }
+ return R.ok().add(Cools
+ .add("list", wrkTraceVos)
+ .add("orderNo", order.getOrderNo())
+ .add("totalQty", totalQty)
+ .add("wrkQty", wrkQty)
+ .add("lackQty", lackQty)
+ .add("endQty",endQty)
+ );
+ }
// ------------------------------------------------------------------------------------------------
@@ -165,29 +401,43 @@
}
}
- @RequestMapping(value = "/order/add/auth")
+ @RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R add(Order order) {
- orderService.insert(order);
- return R.ok();
- }
-
- @RequestMapping(value = "/order/update/auth")
- @ManagerAuth
public R update(Order order){
- if (Cools.isEmpty(order) || null==order.getId()){
+ if (Cools.isEmpty(order) || null == order.getId()){
return R.error();
}
- orderService.updateById(order);
+
+ //璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
+ 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("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ }
+ }
+
+ order.setUpdateBy(getUserId());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("淇敼璁㈠崟澶辫触");
+ }
return R.ok();
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderService.deleteById(id);
- }
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @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();
}
@@ -212,7 +462,7 @@
for (Order order : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
- map.put("value", order.getId());
+ map.put("value", order.getOrderNo());
result.add(map);
}
return R.ok(result);
@@ -228,4 +478,32 @@
return R.ok();
}
+ @RequestMapping(value = "/order/insert/labelUp/file/auth")
+// @ManagerAuth
+ public R insertLabelUpFile(@RequestParam("orderId") String orderId,@RequestParam MultipartFile file){
+ String[] split = orderId.split("-");
+ int id = Integer.parseInt(split[1]);
+ System.out.println("---寮�濮�---");
+ String savePath = "D:/order/labelUp/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+ try{
+ FileSaveExampleUtil.saveFile(file, savePath);
+ }catch (Exception e){
+ return R.error();
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/view/labelUp/file/auth")
+// @ManagerAuth
+ public R viewLabelUpFile(@RequestParam("orderId") Long orderId){
+// int id = Integer.parseInt(orderId);
+ String savePath = "D:/order/labelUp/file/"+orderId+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰�
+ try{
+ List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
+ return R.ok(fileDTOS);
+ }catch (Exception e){
+ return R.error();
+ }
+ }
+
}
--
Gitblit v1.9.1