From 85d11604e29a2fd27ec013e27a5b4387660e510a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 15:35:16 +0800
Subject: [PATCH] #单据出库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 112 ++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/Synchro.java | 39 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OrderOutTaskParam.java | 15 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 94 +++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 11 +
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/ExistDto.java | 12 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java | 27 ++++
9 files changed, 311 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
new file mode 100644
index 0000000..8940c25
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
@@ -0,0 +1,94 @@
+package com.vincent.rsf.server.api.controller.mcp;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.entity.DeviceSite;
+import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.manager.service.DeviceSiteService;
+import com.vincent.rsf.server.manager.service.LocItemService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("/mcp")
+@Api(tags = "mcp鎺ュ彛")
+public class McpController extends BaseController {
+
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+
+
+ @PostMapping("/locItem/useF/list")
+ public R locUseOPage(@RequestBody Map<String, Object> map) {
+ QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
+ if (null != map.get("matnr") && !Cools.isEmpty(map.get("matnr"))){
+ locItemQueryWrapper.eq("matnr_code", map.get("matnr"));
+ }else {
+ return R.error("鐗╂枡缂栫爜涓虹┖");
+ }
+ String applySql = String.format(
+ "EXISTS (SELECT 1 FROM man_loc ml " +
+ "WHERE ml.use_status = '%s'" +
+ "AND ml.id = man_loc_item.loc_id " +
+ ")",
+ LocStsType.LOC_STS_TYPE_F.type
+ );
+ locItemQueryWrapper.apply(applySql);
+ List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
+ for (LocItem locItem : locItems) {
+ if (!Objects.isNull(locItem.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(locItem.getFieldsIndex());
+ locItem.setExtendFields(fields);
+ }
+ }
+ return R.ok().add(locItems);
+ }
+
+
+ @PostMapping("/selectStaList/list")
+ public R selectStaList(@RequestBody Map<String, Object> map) {
+ List<String> longs = null;
+ if (map.get("type") != null) {
+ longs = JSONArray.parseArray(map.get("type").toString(), String.class);
+ map.entrySet().removeIf(next -> next.getKey().equals("type"));
+ }
+ List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
+ return R.ok().add(list);
+ }
+
+ @ApiOperation("鐢熸垚搴撳瓨鍑哄簱浠诲姟")
+ @PostMapping("/generate/task")
+ public R generateTask(@RequestBody LocToTaskParams param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ param.setType(Constants.TASK_TYPE_OUT_STOCK);
+
+ return locItemService.generateTask(param, getLoginUserId());
+ }
+
+
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index e68c14c..44d67d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -52,7 +52,8 @@
"/v3/api-docs/**",
"/swagger-ui/**",
"/ws/**",
- "/wcs/**"
+ "/wcs/**",
+ "/mcp/**"
};
@Resource
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 0db2488..83c1aaa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -231,4 +232,14 @@
}
return outStockService.updateOrderItem(params, getLoginUserId());
}
+
+ @PostMapping("/outStock/order/getOutTaskItems")
+ @PreAuthorize("hasAuthority('manager:outStock:list')")
+ public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ return outStockService.getOrderOutTaskItem(param);
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/ExistDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/ExistDto.java
new file mode 100644
index 0000000..90a8f54
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/ExistDto.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.controller.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ExistDto {
+ private String locNo;
+ private String matnr;
+ private String batch;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
new file mode 100644
index 0000000..19b2c3a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
@@ -0,0 +1,27 @@
+package com.vincent.rsf.server.manager.controller.dto;
+
+import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.utils.Synchro;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrderOutItemDto extends LocItem {
+
+
+
+ private List<staListDto> staNos;
+
+ @Data
+ public static class staListDto{
+ private String staNo;
+ private String staName;
+ }
+
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OrderOutTaskParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OrderOutTaskParam.java
new file mode 100644
index 0000000..3f25aaa
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OrderOutTaskParam.java
@@ -0,0 +1,15 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+@ApiModel(value = "OrderOutTaskParam", description = "璁㈠崟鍑哄簱param")
+public class OrderOutTaskParam implements Serializable {
+
+ private String waveId;
+
+ private Long orderId;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
index b1225fb..152874d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import java.util.List;
@@ -18,4 +19,6 @@
R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId);
R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);
+
+ R getOrderOutTaskItem(OrderOutTaskParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index b84c92f..afe0c81 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -1,17 +1,19 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.manager.controller.dto.ExistDto;
+import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.POExceStatus;
-import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
@@ -23,6 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +59,14 @@
private OutStockItemService outStockItemService;
@Autowired
private OutStockService outStockService;
+ @Autowired
+ private WaveRuleService waveRuleService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private DeviceSiteService deviceSiteService;
+ @Autowired
+ private LocService locService;
/**
@@ -386,6 +397,99 @@
return R.ok();
}
+ @Override
+ public R getOrderOutTaskItem(OrderOutTaskParam param) {
+ if (Cools.isEmpty(param.getWaveId())){
+ throw new CoolException("绛栫暐鍙傛暟涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderId())){
+ throw new CoolException("鍗曟嵁id涓虹┖");
+ }
+ WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>().eq(WaveRule::getCode, param.getWaveId()));
+ if (Cools.isEmpty(waveRule)){
+ throw new CoolException("鏈壘鍒板綋鍓嶇瓥鐣�");
+ }
+ List<OrderOutItemDto> locItems = null;
+ switch (waveRule.getType()) {
+ case 1:
+ locItems = efficiencyFirst(param.getOrderId());
+ break;
+ }
+ return R.ok(locItems);
+ }
+
+ private List<LocItem> getEfficiencyFirstItemList(AsnOrderItem asnOrderItem){
+ QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>();
+ locItemQueryWrapper.eq("matnr_code", asnOrderItem.getMatnrCode());
+ locItemQueryWrapper.eq("batch", asnOrderItem.getBatch());
+ String applySql = String.format(
+ "EXISTS (SELECT 1 FROM man_loc ml " +
+ "WHERE ml.use_status = '%s'" +
+ "AND ml.id = man_loc_item.loc_id " +
+ ")",
+ LocStsType.LOC_STS_TYPE_F.type
+ );
+ locItemQueryWrapper.apply(applySql);
+ List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
+ locItems.sort((s1,s2)->{
+ return LocUtils.isShallowLoc(s1.getLocCode())?1:0;
+ });
+ return locItems;
+ }
+
+ private List<OrderOutItemDto> efficiencyFirst(Long orderId){
+ List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, orderId)
+ );
+
+ List<OrderOutItemDto> list = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+ Set<ExistDto> existDtos = new HashSet<>();
+
+ for (AsnOrderItem asnOrderItem : asnOrderItems) {
+ BigDecimal issued = new BigDecimal(asnOrderItem.getAnfme().toString())
+ .subtract(new BigDecimal(asnOrderItem.getWorkQty().toString())
+ );
+ if (issued.doubleValue() <= 0) {
+ continue;
+ }
+ List<LocItem> locItems = null;
+ locItems = getEfficiencyFirstItemList(asnOrderItem);
+ for (LocItem locItem : locItems) {
+ Loc loc = locService.getById(locItem.getLocId());
+ List<LocItem> itemList = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, locItem.getLocCode()));
+ if (issued.doubleValue() > 0){
+ ExistDto existDto = new ExistDto().setBatch(locItem.getBatch()).setMatnr(locItem.getMatnrCode()).setLocNo(locItem.getLocCode());
+ if (existDtos.add(existDto)){
+ OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
+ orderOutItemDto.sync(locItem);
+ List<DeviceSite> deviceSites = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>()
+ .eq(DeviceSite::getChannel, loc.getChannel())
+ .eq(DeviceSite::getType, issued.doubleValue() >= locItem.getAnfme() && itemList.size() == 1 ? TaskType.TASK_TYPE_OUT.type : TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
+ );
+ List<OrderOutItemDto.staListDto> maps = new ArrayList<>();
+ for (DeviceSite sta : deviceSites) {
+ OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto();
+ staListDto.setStaNo(sta.getSite());
+ staListDto.setStaName(sta.getSite());
+ maps.add(staListDto);
+ }
+ orderOutItemDto.setStaNos(maps);
+
+ list.add(orderOutItemDto);
+
+ issued = issued.subtract(new BigDecimal(locItem.getAnfme().toString()));
+ }
+ }
+
+ }
+ }
+
+ return list;
+
+ }
+
/**
* @param
* @param wave
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/Synchro.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/Synchro.java
new file mode 100644
index 0000000..f2e4e3b
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/Synchro.java
@@ -0,0 +1,39 @@
+package com.vincent.rsf.server.manager.utils;
+
+
+import com.vincent.rsf.framework.exception.CoolException;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * Created by vincent on 2022/4/1
+ */
+public class Synchro {
+
+ public static void Copy(Object source, Object dest) {
+ try {
+ BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+ PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
+ BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+ PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
+ for (PropertyDescriptor propertyDescriptor : sourceProperty) {
+ for (PropertyDescriptor descriptor : destProperty) {
+ if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
+ Method readMethod = propertyDescriptor.getReadMethod();
+ Method writeMethod = descriptor.getWriteMethod();
+ if (null != writeMethod && null != readMethod) {
+ writeMethod.invoke(dest, readMethod.invoke(source));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+ }
+ }
+
+}
--
Gitblit v1.9.1