From 4babe4a1a4e9bfd33f1c6d64eff2e6f12fbe8613 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 10:05:43 +0800
Subject: [PATCH] 新增盘点差异表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 263 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 249 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index c8cd725..8a93ef2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -9,16 +9,14 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
+import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.CheckOrderMapper;
-import com.vincent.rsf.server.manager.service.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.CheckOrderItemService;
-import com.vincent.rsf.server.manager.service.CheckOrderService;
-import com.vincent.rsf.server.manager.service.MatnrService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -40,6 +38,18 @@
private CheckOrderItemService checkOrderItemService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private LocServiceImpl locService;
+ @Autowired
+ private TaskItemServiceImpl taskItemService;
+ @Autowired
+ private CheckOrderService checkOrderService;
/**
* @author Ryan
@@ -93,8 +103,8 @@
matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
.eq(Matnr::getCode, orderTemplate.getMatnrCode()));
}
- orderItem.setAsnId(order.getId())
- .setAsnCode(order.getCode())
+ orderItem.setOrderId(order.getId())
+ .setOrderCode(order.getCode())
.setSplrBatch(orderTemplate.getSplrBatch())
.setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
.setSplrName(orderTemplate.getSplrName())
@@ -168,6 +178,233 @@
* @param
* @return
* @author Ryan
+ * @description 淇敼涓诲崟鍙婃槑缁�
+ * @time 2025/4/29 13:47
+ */
+ @Override
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
+ WkOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(orders.getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(orders)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ throw new CoolException("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ svaeOrUpdateOrderItem(params, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鑾峰彇鐩樼偣鍑哄叆绔欏彛
+ * @version 1.0
+ */
+ @Override
+ public R getSiteNos() {
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type);
+ List<DeviceSite> sites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, list).groupBy(DeviceSite::getSite));
+ return R.ok().add(sites);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鐩樼偣鍑哄簱棰勮
+ * @version 1.0
+ */
+ @Override
+ public R genCheckPreview(OrderOutTaskParam param) {
+ List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, param.getOrderId()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱洏鐐瑰崟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ return R.ok().add(orderItems);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鏍规嵁鐗╂枡鐮佽幏鍙栨墍鏈夊湪搴撴槑缁�
+ * @version 1.0
+ */
+ @Override
+ public R getAllLocByMatnr(List<String> matnrs) {
+ List<LocItem> locItems = locItemService.listByMatnr(matnrs);
+ if (!locItems.isEmpty()) {
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type);
+ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
+ .in(DeviceSite::getType, list)
+ .groupBy(DeviceSite::getSite)
+ .last("limit 1"));
+ if (Objects.isNull(deviceSite)) {
+ throw new CoolException("搴撳彛涓嶄负绌猴紒锛�");
+ }
+ locItems.forEach(locItem -> {
+ locItem.setSiteNo(deviceSite.getSite());
+ });
+ }
+ return R.ok().add(locItems);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/17
+ * @description: 鐢熸垚鐩樼偣浠诲姟
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R genCheckOutTask(List<CheckOrderParams> checkParams, Long loginUserId) {
+ if (checkParams.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ for (CheckOrderParams checkParam : checkParams) {
+ if (checkParam.getItems().isEmpty()) {
+ continue;
+ }
+ Map<String, List<CheckOrderItemParams>> listMap = checkParam.getItems().stream()
+ .collect(Collectors.groupingBy(CheckOrderItemParams::getBarcode));
+ listMap.keySet().forEach(key -> {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, key));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("褰撳墠搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ Task task1 = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, key));
+ if (!Objects.isNull(task1)) {
+ throw new CoolException("鎵樼洏浠诲姟宸插瓨鍦紒锛�");
+ }
+ List<CheckOrderItemParams> itemParams = listMap.get(key);
+ CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
+ Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ task.setOrgLoc(loc.getCode())
+ .setTaskCode(ruleCode)
+ .setTargSite(checkItem.getSiteNo())
+ .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
+ .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
+ .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setBarcode(key);
+
+ if (!taskService.save(task)) {
+ throw new CoolException("鐩樼偣浠诲姟鐢熸垚澶辫触锛侊紒");
+ }
+ List<TaskItem> items = new ArrayList<>();
+ itemParams.forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ taskItem.setTaskId(task.getId())
+ .setOrderType(OrderType.ORDER_CHECK.type)
+ .setAnfme(item.getAnfme())
+ .setWorkQty(0.0)
+ .setBatch(checkParam.getBatch())
+ .setMaktx(checkParam.getMaktx())
+ .setMatnrCode(checkParam.getMatnrCode())
+ .setPlatOrderCode(checkParam.getPlatOrderCode())
+ .setPlatWorkCode(checkParam.getPlatWorkCode())
+ .setSpec(checkParam.getSpec())
+ .setModel(checkParam.getModel())
+ .setFieldsIndex(checkParam.getFieldsIndex())
+ .setMatnrId(checkParam.getMatnrId())
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
+ .setOrderItemId(checkParam.getId())
+ .setOrderId(checkParam.getOrderId())
+ .setPlatItemId(checkParam.getPlatItemId());
+ items.add(taskItem);
+
+ if (!checkOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getId, checkParam.getId())
+ .setSql("work_qty = work_qty + " + item.getAnfme())
+ .set(WkOrderItem::getWorkQty, checkItem.getAnfme()))) {
+ throw new CoolException("鐩樼偣鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ });
+ if (!taskItemService.saveBatch(items)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅棰勭害鍑哄簱澶辫触锛侊紒");
+ }
+
+ });
+
+ Set<Long> checkItemIds = checkParams.stream().map(CheckOrderParams::getOrderId).collect(Collectors.toSet());
+ checkItemIds.forEach(orderId -> {
+ WkOrder order = this.getById(orderId);
+ if (Objects.isNull(order)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
+
+ if (order.getAnfme().compareTo(sum) <= 0) {
+ order.setWorkQty(sum).setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val);
+ } else {
+ order.setWorkQty(sum).setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_ING.val);
+ }
+
+ if (!this.updateById(order)) {
+ throw new CoolException("鐩樼偣鍗曚俊鎭慨鏀瑰け璐ワ紒锛�");
+ }
+ });
+ }
+ return R.ok();
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/16
+ * @description: 鍙栨秷鐩樼偣鍗曟嵁
+ * @version 1.0
+ */
+ @Override
+ public R cancelCheckOrder(Long id) {
+ WkOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ if (!order.getExceStatus().equals(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)) {
+ throw new CoolException("褰撳墠鍗曟嵁涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
+ }
+
+ if (!this.removeById(id)) {
+ throw new CoolException("鐩樼偣鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!checkOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id))) {
+ throw new CoolException("鐩樼偣鍗曟槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ return R.ok();
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
* @description 鏇存柊鎴栦繚瀛樻槑缁�
* @time 2025/4/7 13:28
*/
@@ -175,8 +412,8 @@
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
- item.put("asnId", orders.getId());
- item.put("asnCode", orders.getCode());
+ item.put("orderId", orders.getId());
+ item.put("orderCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
@@ -185,13 +422,11 @@
}
});
List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
+ .eq(WkOrderItem::getOrderId, params.getOrders().getId()));
Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
}
}
-
-
}
--
Gitblit v1.9.1