From b06233aa71b70f7a30ff382ae1ba19c29b134d7c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 28 十一月 2025 15:41:51 +0800
Subject: [PATCH] #库存调整完成
---
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index a2886a9..e3a6a16 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
@@ -11,8 +11,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CheckTaskListParam;
+import com.zy.asrs.entity.param.OpenAdjustmentOrderParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.CheckOrderExportDTO;
+import com.zy.asrs.enums.CheckStatusEnum;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.zy.common.entity.NodeExcel;
@@ -40,6 +43,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private OpenService openService;
@PostMapping(value = "/checkOrder/pdaComplete/auth")
@ManagerAuth(memo = "pda锛氬畬鎴愮洏鐐�")
@@ -135,10 +140,14 @@
checkOrderDetl.setBatch(locDetl.getBatch());
checkOrderDetl.setSpecs(locDetl.getSpecs());
checkOrderDetl.setAnfme(new BigDecimal(locDetl.getAnfme().toString()));
- checkOrderDetl.setQty(BigDecimal.ZERO);
+ checkOrderDetl.setDiffQty(BigDecimal.ZERO);
checkOrderDetl.setWorkQty(BigDecimal.ZERO);
checkOrderDetl.setStatus(1);
checkOrderDetl.setZpallet(locDetl.getZpallet());
+ checkOrderDetl.setCreateBy(getUserId());
+ checkOrderDetl.setCreateTime(now);
+ checkOrderDetl.setUpdateBy(getUserId());
+ checkOrderDetl.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
@@ -181,10 +190,14 @@
checkOrderDetl1.setBatch(checkOrderDetl.getBatch());
checkOrderDetl1.setSpecs(checkOrderDetl.getSpecs());
checkOrderDetl1.setAnfme(checkOrderDetl.getAnfme());
- checkOrderDetl1.setQty(checkOrderDetl.getQty());
+ checkOrderDetl1.setDiffQty(checkOrderDetl.getDiffQty());
checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
+ checkOrderDetl1.setCreateBy(getUserId());
+ checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
+ checkOrderDetl1.setUpdateBy(getUserId());
+ checkOrderDetl1.setUpdateTime(now);
if (!checkOrderDetlService.insert(checkOrderDetl1)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
@@ -212,6 +225,25 @@
allLike(CheckOrder.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
wrapper.orderBy("create_time", false);
+ wrapper.eq("doc_type", OrderTypeEnum.INVENTORY.type);
+ return R.ok(checkOrderService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/adjustOrder/list/auth")
+ @ManagerAuth
+ public R adjustList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<CheckOrder> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(CheckOrder.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("create_time", false);
+ wrapper.eq("doc_type", OrderTypeEnum.ADJUSTMENT.type);
return R.ok(checkOrderService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -314,4 +346,29 @@
return R.ok();
}
+
+ @PostMapping(value = "/adjustOrder/create/test")
+ @ManagerAuth(memo = "鍐呴儴娴嬭瘯锛氱敓鎴愯皟鏁村崟")
+ public R adjustOrderCreateTest(@RequestParam("orderId") Long orderId) {
+ CheckOrder checkOrder = checkOrderService.selectById(orderId);
+ List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
+ checkOrderDetls.forEach(checkOrderDetl -> { checkOrderDetl.setStatus(1);});
+ OpenAdjustmentOrderParam openAdjustmentOrderParam = new OpenAdjustmentOrderParam();
+ openAdjustmentOrderParam.setOrderTime(DateUtils.convert(new Date()));
+ openAdjustmentOrderParam.setOrderDetails(checkOrderDetls);
+
+ openService.adjustmentOrderCreate(openAdjustmentOrderParam);
+
+ return R.ok();
+
+ }
+
+ @PostMapping(value = "/adjustOrder/complete/auth")
+ @ManagerAuth(memo = "瀹屾垚璋冩暣鍗�")
+ public R adjustOrderComplete(@RequestParam("orderId") Long orderId) {
+ checkOrderService.adjustOrderComplete(orderId,getUserId());
+ return R.ok();
+ }
+
+
}
--
Gitblit v1.9.1