From 82065a03737fa1370eb9f4f01ab5332933baf08a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 09:23:37 +0800
Subject: [PATCH] 云仓WMS+RCS+自动入库临时方法配置
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 555 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 454 insertions(+), 101 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 5f955a8..81635dd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -5,7 +5,7 @@
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.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
@@ -14,12 +14,14 @@
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl;
import com.vincent.rsf.server.system.constant.CodeRes;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -28,12 +30,15 @@
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.mapper.FieldsMapper;
import com.vincent.rsf.server.system.mapper.TenantMapper;
+import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -56,6 +61,8 @@
*/
@Service
public class MobileServiceImpl implements MobileService {
+
+ private static final Logger logger = LoggerFactory.getLogger(MobileServiceImpl.class);
@Value("${super.pwd}")
private String superPwd;
@@ -91,13 +98,10 @@
private FieldsMapper fieldsMapper;
@Autowired
private IsptHistoriesMapper isptHistoriesMapper;
-
@Autowired
private AsnOrderLogService asnOrderLogService;
-
@Autowired
private WaitPakinService waitPakinService;
-
@Autowired
private WaitPakinItemService waitPakinItemService;
@Autowired
@@ -126,6 +130,12 @@
private DeviceSiteMapper deviceSiteMapper;
@Autowired
private ConfigService configService;
+ @Autowired
+ private CompanysService companysService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private BasContainerService basContainerService;
/**
* @return
@@ -174,14 +184,14 @@
if (StringUtils.isBlank(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getTrackCode, barcode));
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getTrackCode, barcode));
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -229,21 +239,36 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getCode, asnCode));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, asnCode));
+
+ //鍒ゆ柇璋冩嫈鍗曞嚭搴撴槸鍚﹀畬鎴�
+ if (wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getPoId, wkOrder.getPoId())
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type));
+ if (Objects.isNull(one)) {
+ throw new CoolException("鏁版嵁閿欒锛侊紒");
+ }
+ if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
+ throw new CoolException("璋冩嫈鍑哄簱鍗曟湭瀹屾垚锛屼笉鍙墽琛屾敹璐ф搷浣滐紒锛�");
+ }
+ }
+
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = asnOrder.getQty() + receiptQty;
-
- asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- if (!asnOrderMapper.updateById(asnOrder)) {
+ Double rcptedQty = QuantityUtils.add(wkOrder.getQty(), receiptQty);
+ wkOrder.setQty(rcptedQty);
+ if (AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val.equals(wkOrder.getExceStatus())) {
+ wkOrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ }
+ if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
-
Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
-
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
@@ -267,7 +292,7 @@
// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, dto.getId()));
//asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
if (Objects.isNull(orderItem)) {
@@ -286,14 +311,14 @@
throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
}
- Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
+ Double itemRcptQty = QuantityUtils.add(dto.getReceiptQty(), orderItem.getQty());
Boolean allowOver = false;
if (!Objects.isNull(config)) {
if (Boolean.parseBoolean(config.getVal())) {
allowOver = true;
}
}
- if (itemRcptQty.compareTo(orderItem.getAnfme()) > 0 && !allowOver) {
+ if (QuantityUtils.compare(itemRcptQty, orderItem.getAnfme()) > 0 && !allowOver) {
throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
@@ -330,13 +355,16 @@
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
-
+ // DirectWaitPakin 鍚敤鏃朵繚瀛樿嚦鏀惰揣鍖猴紝褰㈡垚闂幆锛涙湭鍚敤鏃朵笉鍐欐敹璐у尯
+ Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ if (directPakinConfig != null && Boolean.parseBoolean(directPakinConfig.getVal())) {
+ extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
+ }
}
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
- if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ // 宸叉敹鏁伴噺 >= 璁″垝鏁伴噺鏃剁疆涓烘敹璐у畬鎴�(2)
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
+ if (order != null && order.getAnfme() != null && QuantityUtils.compare(order.getQty(), order.getAnfme()) >= 0) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
if (!asnOrderMapper.updateById(order)) {
throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -346,21 +374,31 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
+
+ Companys companys = new Companys();
+ if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
+ companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
+ }
+
WarehouseAreasItem item = new WarehouseAreasItem();
item.setTrackCode(dto.getBarcode())
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
.setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
+ .setAsnCode(wkOrder.getCode())
+ .setAsnId(wkOrder.getId())
.setProdTime(dto.getProdTime())
+ .setSplrId(companys.getId())
.setWeight(dto.getWeigth())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
.setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
- .setAnfme(dto.getReceiptQty())
+ .setAnfme(QuantityUtils.roundToScale(dto.getReceiptQty()))
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
.setUpdateBy(loginUserId)
@@ -389,7 +427,7 @@
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ item.setAnfme(QuantityUtils.add(item.getAnfme(), serviceOne.getAnfme()));
}
//鏈川妫�
@@ -432,25 +470,25 @@
List<Short> shorts = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE
.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .notIn(AsnOrder::getExceStatus, shorts)
- .eq(AsnOrder::getCode, params.getAsnCode()));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .notIn(WkOrder::getExceStatus, shorts)
+ .eq(WkOrder::getCode, params.getAsnCode()));
if (Objects.isNull(order)) {
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
- .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderCode, params.getAsnCode())
+ .eq(!Objects.isNull(params.getTrackCode()), WkOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), WkOrderItem::getMatnrCode, params.getMatnrCode())
);
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -468,9 +506,9 @@
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
*/
@Override
- public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
- return asnOrders;
+ public List<WkOrder> getAllAsnOrders() {
+ List<WkOrder> wkOrders = asnOrderMapper.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
+ return wkOrders;
}
/**
@@ -480,8 +518,13 @@
* @description 鑾峰彇鏀惰揣鍖�
* @time 2025/3/11 10:12
*/
+ /** DirectWaitPakin 鍚敤鏃惰繑鍥炴敹璐у尯鍒楄〃锛屾湭鍚敤鏃惰繑鍥炵┖鍒楄〃锛堜笉褰卞搷缁勬墭涓庝簯浠撳叆搴撴祦绋嬶級 */
@Override
public R getReceiptAreas() {
+ Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ if (directPakinConfig == null || !Boolean.parseBoolean(directPakinConfig.getVal())) {
+ return R.ok(Collections.emptyList());
+ }
List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
return R.ok(areas);
@@ -509,20 +552,318 @@
* @time 2025/4/7 16:58
*/
@Override
- public R getDeltByCode(Map<String, Object> params) {
- Object code = params.get("code");
- Object matnrCode = params.get("matnrCode");
- Object asnCode = params.get("asnCode");
- Object batch = params.get("batch");
+ public R getDeltByCode(Map<String, String> params) {
+ String code = params.get("code");
+ String matnrCode = params.get("matnrCode");
+ String asnCode = params.get("asnCode");
+ String crushNo = params.get("fieldsIndex");
+ String batch = params.get("batch");
+// String barcode = params.get("barcode");
- //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
- .or().eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
- .or().eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
- .or().eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
- .or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
+// if (Objects.isNull(crushNo)) {
+// throw new CoolException("绁ㄥ彿涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(code)) {
+// throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
+// }
+// BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, barcode));
+// if (Objects.isNull(container)) {
+// throw new CoolException("瀹瑰櫒涓嶅瓨鍦紒锛�");
+// }
+// if (!Objects.isNull(params.get("isHalf")) && !params.get("isHalf").equals("0")) {
+// container.setIsHalf(1);
+// if (!basContainerService.updateById(container)) {
+// throw new CoolException("瀹瑰櫒鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// }
+// }
+
+ String fieldIndexTemp = null;
+ if (!Objects.isNull(crushNo)) {
+ FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getValue, crushNo).last("Limit 1"));
+ if (!Objects.isNull(fieldsItem)) {
+ fieldIndexTemp = fieldsItem.getUuid();
+ }
+ }
+ final String fieldIndex = fieldIndexTemp;
+
+ // 妫�鏌ユ槸鍚︽湁鑷冲皯涓�涓湁鏁堟煡璇㈡潯浠�
+ boolean hasValidCondition = !Cools.isEmpty(code) || !Cools.isEmpty(batch)
+ || !Objects.isNull(fieldIndex) || !Cools.isEmpty(matnrCode) || !Cools.isEmpty(asnCode);
+
+ if (!hasValidCondition) {
+ throw new CoolException("璇疯嚦灏戣緭鍏ヤ竴涓煡璇㈡潯浠讹細鐗╂枡缂栫爜銆乄MS鍗曞彿銆佹壒鍙�");/*銆佽窡韪爜銆佹壒娆℃垨绁ㄥ彿*/
+ }
+
+ // 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code)
+ && Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
+ logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
+ logger.info("鏌ヨ鍙傛暟 - matnrCode: {}", matnrCode);
+
+ Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, matnrCode)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+
+ if (matnr == null) {
+ logger.warn("鐗╂枡淇℃伅琛ㄤ腑鏈壘鍒扮墿鏂欑紪鐮�: {}", matnrCode);
+ return R.ok(new ArrayList<>());
+ }
+
+ // 鏋勯�犱竴涓櫄鎷熺殑 WarehouseAreasItem 瀵硅薄杩斿洖鐗╂枡淇℃伅
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setMatnrId(matnr.getId());
+ item.setMatnrCode(matnr.getCode());
+ item.setMaktx(matnr.getName());
+ item.setStockUnit(matnr.getStockUnit());
+ item.setUnit(matnr.getUnit());
+ item.setAnfme(0.0); // 鏁伴噺璁句负0锛屽洜涓轰笉鏄粠鏀惰揣鍖烘煡璇㈢殑
+ item.setWorkQty(0.0);
+ item.setQty(0.0);
+
+ // 璁剧疆鎵╁睍瀛楁
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ item.setExtendFields(fields);
+
+ List<WarehouseAreasItem> resultList = new ArrayList<>();
+ resultList.add(item);
+
+ logger.info("浠庣墿鏂欎俊鎭〃杩斿洖 1 鏉＄墿鏂欐暟鎹�");
+ return R.ok(resultList);
+ }
+
+ // 鏈堿SN鍗曞彿鏃讹細DirectWaitPakin 鍚敤鍒欎粠鏀惰揣鍖烘煡鍙粍鎵樼墿鏂欙紝鏈惎鐢ㄥ垯浠庤鍗曟槑缁嗘煡锛堝彲缁勭洏鏁伴噺 = 璁″垝 - 宸茬粍鎵� - 宸蹭笂鏋讹級
+ if (!Cools.isEmpty(asnCode)) {
+ Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ if (directPakinConfig != null && Boolean.parseBoolean(directPakinConfig.getVal())) {
+ LambdaQueryWrapper<WarehouseAreasItem> receiptWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnCode, asnCode);
+ if (!Cools.isEmpty(matnrCode)) receiptWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ if (!Cools.isEmpty(batch)) receiptWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ if (!Objects.isNull(fieldIndex)) receiptWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ if (!Cools.isEmpty(code)) receiptWrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ List<WarehouseAreasItem> receiptList = warehouseAreasItemService.list(receiptWrapper);
+ // 缁勬墭閫氱煡妗ｏ紙WaitPakinItem锛夌殑宸茬粍鎵樻暟閲忎篃瑕佹墸鍑忥細鏀惰揣鍖� workQty 浠呭弽鏄犱粠鏀惰揣鍖虹粍鎵樼殑閮ㄥ垎锛屼粠璁㈠崟鐩存帴缁勬墭鐨勫湪姝ゆ眹鎬�
+ Map<Long, Double> waitPakinSumByItemId = new java.util.HashMap<>();
+ if (!receiptList.isEmpty() && receiptList.stream().anyMatch(e -> e.getAsnId() != null && e.getAsnItemId() != null)) {
+ List<Long> asnItemIds = receiptList.stream().map(WarehouseAreasItem::getAsnItemId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ Long asnId = receiptList.get(0).getAsnId();
+ if (asnId != null && !asnItemIds.isEmpty()) {
+ List<WaitPakinItem> wpItems = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, asnId).in(WaitPakinItem::getAsnItemId, asnItemIds).eq(WaitPakinItem::getDeleted, 0));
+ wpItems.forEach(w -> waitPakinSumByItemId.merge(w.getAsnItemId(), w.getAnfme() != null ? w.getAnfme() : 0.0, (a, b) -> (a != null ? a : 0.0) + (b != null ? b : 0.0)));
+ waitPakinSumByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ }
+ }
+ // 鍙粍鎵� = 璁″垝(anfme) - 宸茬粍鎵�(waitPakinSumByItemId)锛屼笉鍙犲姞 areaWorkQty 閬垮厤涓庣粍鎵樻。姹囨�婚噸澶嶈绠�
+ receiptList.removeIf(e -> {
+ Double anfme = e.getAnfme() != null ? e.getAnfme() : 0.0;
+ Double qty = e.getQty() != null ? e.getQty() : 0.0;
+ Double alreadyInWaitPakin = e.getAsnItemId() != null ? waitPakinSumByItemId.getOrDefault(e.getAsnItemId(), 0.0) : 0.0;
+ Double totalAlready = QuantityUtils.roundToScale(alreadyInWaitPakin);
+ Double available = QuantityUtils.roundToScale(QuantityUtils.subtract(QuantityUtils.subtract(anfme, totalAlready), qty));
+ e.setWorkQty(totalAlready);
+ e.setAvailablePalletQty(available);
+ return QuantityUtils.compare(available, 0.0) <= 0;
+ });
+ logger.info("=== 浠庢敹璐у尯鏌ヨ鍙粍鎵樼墿鏂欙紙DirectWaitPakin锛塧snCode: {} 杩斿洖 {} 鏉�", asnCode, receiptList.size());
+ return R.ok(receiptList);
+ }
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
+ if (order == null) {
+ logger.info("鏈壘鍒癆SN鍗曞彿: {}", asnCode);
+ return R.ok(Collections.emptyList());
+ }
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
+ Map<Long, Double> palletizedByItemId = pakinItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ palletizedByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ LambdaQueryWrapper<WkOrderItem> itemWrapper = new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId());
+ if (!Cools.isEmpty(matnrCode)) itemWrapper.eq(WkOrderItem::getMatnrCode, matnrCode);
+ if (!Cools.isEmpty(batch)) itemWrapper.eq(WkOrderItem::getSplrBatch, batch);
+ if (!Objects.isNull(fieldIndex)) itemWrapper.eq(WkOrderItem::getFieldsIndex, fieldIndex);
+ if (!Cools.isEmpty(code)) itemWrapper.eq(WkOrderItem::getTrackCode, code);
+ List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(itemWrapper);
+ List<WarehouseAreasItem> list = new ArrayList<>();
+ for (WkOrderItem oi : orderItems) {
+ Double anfme = QuantityUtils.roundToScale(oi.getAnfme() != null ? oi.getAnfme() : 0.0);
+ Double qty = QuantityUtils.roundToScale(oi.getQty() != null ? oi.getQty() : 0.0);
+ Double workQty = palletizedByItemId.getOrDefault(oi.getId(), 0.0);
+ // 鍙粍鐩樻暟閲� = 璁″垝 - 宸茬粍鎵橈紙涓嶆墸鍑忔槑缁嗗畬鎴愭暟閲� qty锛岄伩鍏嶄簯浠撳悓姝ュ畬鎴愭暟閲�=璁″垝鍚庡鑷村彲缁勬墭琚畻鎴� 0锛�
+ Double availablePalletQty = QuantityUtils.roundToScale(QuantityUtils.subtract(anfme, workQty));
+ if (QuantityUtils.compare(availablePalletQty, 0.0) <= 0) continue;
+ WarehouseAreasItem v = new WarehouseAreasItem();
+ v.setId(oi.getId());
+ v.setAsnItemId(oi.getId());
+ v.setAsnId(order.getId());
+ v.setAsnCode(order.getCode());
+ v.setAnfme(anfme);
+ v.setQty(qty);
+ v.setWorkQty(QuantityUtils.roundToScale(workQty));
+ v.setAvailablePalletQty(availablePalletQty);
+ v.setMatnrCode(oi.getMatnrCode());
+ v.setMaktx(oi.getMaktx());
+ v.setSplrBatch(oi.getSplrBatch());
+ v.setPlatItemId(oi.getPlatItemId());
+ v.setStockUnit(oi.getStockUnit());
+ v.setUnit(oi.getStockUnit());
+ v.setMatnrId(oi.getMatnrId());
+ v.setFieldsIndex(oi.getFieldsIndex());
+ v.setTrackCode(oi.getTrackCode());
+ if (oi.getFieldsIndex() != null) {
+ v.setExtendFields(FieldsUtils.getFields(oi.getFieldsIndex()));
+ }
+ list.add(v);
+ }
+ logger.info("=== 浠庤鍗曟槑缁嗘煡璇㈠彲缁勬墭鐗╂枡 asnCode: {} 杩斿洖 {} 鏉�", asnCode, list.size());
+ return R.ok(list);
+ }
+
+ // 鏃燗SN鍗曞彿鏃舵寜鍏朵粬鏉′欢鏌ワ紙鏀惰揣鍖哄凡鍋滅敤锛屾澶勪粎淇濈暀鍏煎锛岄�氬父鏃犳暟鎹級
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<>();
+ {
+ // 娌℃湁ASN鍗曞彿鏃讹紝鍙互鎵弿浠绘剰鐗╂枡缁勬墭锛屼娇鐢∣R杩炴帴澶氫釜鏉′欢
+ // 缁熻鏈夋晥鏉′欢鏁伴噺
+ int conditionCount = 0;
+ if (!Cools.isEmpty(code)) conditionCount++;
+ if (!Cools.isEmpty(batch)) conditionCount++;
+ if (!Objects.isNull(fieldIndex)) conditionCount++;
+ if (!Cools.isEmpty(matnrCode)) conditionCount++;
+
+ // 濡傛灉鍙湁涓�涓潯浠讹紝鐩存帴浣跨敤eq
+ if (conditionCount == 1) {
+ if (!Cools.isEmpty(code)) {
+ queryWrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ } else if (!Cools.isEmpty(batch)) {
+ queryWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ } else if (!Objects.isNull(fieldIndex)) {
+ queryWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ } else if (!Cools.isEmpty(matnrCode)) {
+ queryWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ }
+ } else if (conditionCount > 1) {
+ // 澶氫釜鏉′欢锛屼娇鐢∣R杩炴帴
+ queryWrapper.and(wrapper -> {
+ boolean first = true;
+ if (!Cools.isEmpty(code)) {
+ wrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ first = false;
+ }
+ if (!Cools.isEmpty(batch)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ first = false;
+ }
+ if (!Objects.isNull(fieldIndex)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ first = false;
+ }
+ if (!Cools.isEmpty(matnrCode)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ }
+ });
+ }
+ }
+
+ // 鎵撳嵃鏌ヨ鍙傛暟鍒版帶鍒跺彴
+ logger.info("=== 鏌ヨ鍙粍鎵樼墿鏂� ===");
+ logger.info("鏌ヨ鍙傛暟 - code: {}, matnrCode: {}, asnCode: {}, batch: {}, fieldIndex: {}",
+ code, matnrCode, asnCode, batch, fieldIndex);
+
List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
- list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ logger.info("鏌ヨ鍒� {} 鏉℃敹璐у尯搴撳瓨鏁版嵁", list.size());
+
+ // 杩囨护鏉′欢锛氬彧杩斿洖鍙粍鎵樻暟閲� > 0 鐨勬暟鎹�
+ // 鍙粍鎵樻暟閲� = anfme - workQty - qty
+ if (!list.isEmpty()) {
+ int beforeFilterSize = list.size();
+ list.removeIf(e -> {
+ // 濡傛灉anfme涓簄ull锛岀Щ闄よ鏁版嵁
+ Double anfme = e.getAnfme();
+ if (Objects.isNull(anfme) || anfme <= 0) {
+ logger.debug("杩囨护鏁版嵁 - ID: {}, matnrCode: {}, anfme涓簄ull鎴�<=0: {}",
+ e.getId(), e.getMatnrCode(), anfme);
+ return true; // 绉婚櫎鏁伴噺涓簄ull鎴�<=0鐨勬暟鎹�
+ }
+
+ Double workQty = Objects.isNull(e.getWorkQty()) ? 0.0 : e.getWorkQty();
+ Double qty = Objects.isNull(e.getQty()) ? 0.0 : e.getQty();
+
+ // 鍙粍鎵樻暟閲� = 鎬绘暟閲� - 宸叉墽琛屾暟閲� - 宸叉敹璐ф暟閲�
+ Double availableQty = anfme - workQty - qty;
+ if (availableQty <= 0) {
+ logger.debug("杩囨护鏁版嵁 - ID: {}, matnrCode: {}, anfme: {}, workQty: {}, qty: {}, 鍙粍鎵樻暟閲�: {} <= 0",
+ e.getId(), e.getMatnrCode(), anfme, workQty, qty, availableQty);
+ }
+ return availableQty <= 0; // 绉婚櫎鍙粍鎵樻暟閲� <= 0 鐨勬暟鎹�
+ });
+
+ // 濡傛灉杩囨护鍚庢暟鎹负绌猴紝璇存槑鎵�鏈夋暟鎹兘琚繃婊ゆ帀浜�
+ if (list.isEmpty() && beforeFilterSize > 0) {
+ logger.warn("鏈壘鍒板彲缁勬墭鐨勭墿鏂欙紝璇锋鏌ワ細1.鐗╂枡缂栫爜鏄惁姝ｇ‘ 2.鐗╂枡鏄惁宸叉敹璐ц嚦鏀惰揣鍖� 3.鏄惁杩樻湁鍙粍鎵樻暟閲�");
+ logger.warn("鏌ヨ鏉′欢 - code: {}, matnrCode: {}, asnCode: {}, batch: {}, fieldIndex: {}",
+ code, matnrCode, asnCode, batch, fieldIndex);
+ logger.warn("鏌ヨ鍒� {} 鏉℃暟鎹紝浣嗗叏閮ㄨ杩囨护锛堝彲缁勬墭鏁伴噺 <= 0锛�", beforeFilterSize);
+ }
+ } else {
+ logger.warn("鏈壘鍒板彲缁勬墭鐨勭墿鏂欙紝璇锋鏌ワ細1.鐗╂枡缂栫爜鏄惁姝ｇ‘ 2.鐗╂枡鏄惁宸叉敹璐ц嚦鏀惰揣鍖� 3.鏄惁杩樻湁鍙粍鎵樻暟閲�");
+ logger.warn("鏌ヨ鏉′欢 - code: {}, matnrCode: {}, asnCode: {}, batch: {}, fieldIndex: {}",
+ code, matnrCode, asnCode, batch, fieldIndex);
+ logger.warn("鏁版嵁搴撴煡璇㈢粨鏋滀负绌猴紝鍙兘鍘熷洜锛�1.鐗╂枡缂栫爜涓嶅尮閰� 2.鐗╂枡鏈敹璐ц嚦鏀惰揣鍖� 3.鏁版嵁宸茶鍒犻櫎");
+ }
+
+ // 濡傛灉鎵弿鐗╂枡缂栫爜鍔犺浇鐗╂枡骞朵笖ASN鍗曞彿涓虹┖鏃讹紝浠庣墿鏂欎俊鎭〃鑾峰彇鐗╂枡淇℃伅骞舵洿鏂�
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && !list.isEmpty()) {
+ // 鏀堕泦鎵�鏈夊敮涓�鐨勭墿鏂欑紪鐮�
+ Set<String> matnrCodes = list.stream()
+ .map(WarehouseAreasItem::getMatnrCode)
+ .filter(matCode -> !Cools.isEmpty(matCode))
+ .collect(Collectors.toSet());
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅
+ if (!matnrCodes.isEmpty()) {
+ Map<String, Matnr> matnrMap = new HashMap<>();
+ for (String matCode : matnrCodes) {
+ Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, matCode)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+ if (matnr != null) {
+ matnrMap.put(matCode, matnr);
+ }
+ }
+
+ // 鏇存柊鍒楄〃涓殑鐗╂枡淇℃伅
+ list.forEach(item -> {
+ String itemMatnrCode = item.getMatnrCode();
+ if (!Cools.isEmpty(itemMatnrCode) && matnrMap.containsKey(itemMatnrCode)) {
+ Matnr matnr = matnrMap.get(itemMatnrCode);
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鐗╂枡鍚嶇О
+ if (!Cools.isEmpty(matnr.getName())) {
+ item.setMaktx(matnr.getName());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊搴撳瓨鍗曚綅
+ if (!Cools.isEmpty(matnr.getStockUnit())) {
+ item.setStockUnit(matnr.getStockUnit());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鍗曚綅
+ if (!Cools.isEmpty(matnr.getUnit())) {
+ item.setUnit(matnr.getUnit());
+ }
+ logger.debug("宸蹭粠鐗╂枡淇℃伅琛ㄦ洿鏂扮墿鏂欎俊鎭� - matnrCode: {}, name: {}, stockUnit: {}",
+ itemMatnrCode, matnr.getName(), matnr.getStockUnit());
+ }
+ });
+ }
+ }
+
+ list.forEach(item -> {
+ Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
+ item.setExtendFields(fields);
+ });
+
+ logger.info("杩斿洖 {} 鏉″彲缁勬墭鐗╂枡鏁版嵁", list.size());
return R.ok(list);
}
@@ -559,13 +900,13 @@
*/
@Override
public R inspect(String code, Long loginUserId) {
- AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
- if (Objects.isNull(asnOrders)) {
+ WkOrder wkOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, code));
+ if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
InspectDetlDto detlDto = new InspectDetlDto();
- detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode());
- List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
+ detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
+ List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
} else {
@@ -587,7 +928,7 @@
detlDto.setItems(itemDtos);
}
- List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId()));
+ List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
detlDto.setHistories(histories);
return R.ok(detlDto);
}
@@ -604,12 +945,12 @@
if (org.apache.commons.lang3.StringUtils.isBlank(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderMapper.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrder> orders = new ArrayList<>();
- orders.add(asnOrder);
+ List<WkOrder> orders = new ArrayList<>();
+ orders.add(wkOrder);
if (asnOrderMapper.notifyInspect(orders)) {
return R.ok("涓婃姤鎴愬姛锛侊紒");
} else {
@@ -694,17 +1035,17 @@
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.getBarcode())
- .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
);
- if (Cools.isEmpty(waitPakin)){
+ if (Cools.isEmpty(waitPakin)) {
throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
}
List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
- if (Cools.isEmpty(waitPakinItems)){
+ if (Cools.isEmpty(waitPakinItems)) {
throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏");
}
@@ -728,12 +1069,12 @@
if (Objects.isNull(params.getItemList()) || params.getItemList().isEmpty()) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
- Long OrderId = params.getItemList().stream().findFirst().get().getAsnId();
+ Long OrderId = params.getItemList().stream().findFirst().get().getOrderId();
/**鑾峰彇骞冲簱璁㈠崟*/
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, OrderId)
- .eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
- .eq(AsnOrder::getType, OrderType.ORDER_IN.type));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getId, OrderId)
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type));
if (Objects.isNull(order)) {
throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
@@ -748,8 +1089,8 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
- List<AsnOrderItem> itemList = params.getItemList();
- double sum = itemList.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> itemList = params.getItemList();
+ Double sum = QuantityUtils.roundToScale(itemList.stream().mapToDouble(WkOrderItem::getAnfme).sum());
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
@@ -892,27 +1233,36 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
-// if (Objects.isNull(params.get("code"))) {
-// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
-// }
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
Short flagDefect = 0;
if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
flagDefect = 1;
}
- List<WaitPakin> waitPakin = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.get("barcode").toString())
-// .eq(WaitPakin::getFlagDefect, flagDefect)
+ .eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
- if (!Cools.isEmpty(waitPakin)) {
- throw new CoolException("鎵樼洏涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
+// if (!Cools.isEmpty(waitPakin)) {
+// throw new CoolException("鏂欑涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
+// }
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.get("barcode").toString()));
+ if (!tasks.isEmpty()) {
+ throw new CoolException("鏂欑鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
}
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
if (!Cools.isEmpty(locs)) {
- throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
+ throw new CoolException("鏂欑涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
}
- return R.ok("鎵樼洏鍙敤");
+// List<WaitPakinItem> items = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+// items.forEach(item -> {
+// FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getUuid, item.getFieldsIndex()).last("limit 1"));
+// if (!Objects.isNull(fieldsItem) && !Objects.isNull(item.getFieldsIndex())) {
+// Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
+// item.setExtendFields(fields);
+// }
+// });
+ return R.ok();
}
/**
@@ -924,17 +1274,15 @@
*/
@Override
public R getUnItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("barcode"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ if (Cools.isEmpty(params.get("barcode")) && Cools.isEmpty(params.get("code"))) {
+ throw new CoolException("鏂欑鐮佷笌缁勬墭妗ｇ紪鐮佷笉鑳藉叏涓虹┖");
}
- //鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
-// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
-
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+ .eq(!Cools.isEmpty(params.get("barcode")), WaitPakin::getBarcode, params.get("barcode"))
+ .eq(!Cools.isEmpty(params.get("code")), WaitPakin::getCode, params.get("code"))
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
- return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
+ return R.error("鏈壘鍒拌鏂欑鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
}
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin.getId()));
@@ -964,7 +1312,7 @@
*/
@Override
public R defectProducts(String trackCode) {
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, trackCode));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getTrackCode, trackCode));
return R.ok(orderItem);
}
@@ -994,10 +1342,14 @@
*/
@Override
public R getDeviceSites() {
- List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
+ // 鍏堟煡鍏ㄩ儴鍐嶆寜 site 鍘婚噸锛岄伩鍏� GROUP BY 涓� only_full_group_by 鍐茬獊
+ List<DeviceSite> all = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
.select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
- .eq(DeviceSite::getStatus, 1)
- .groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
+ .eq(DeviceSite::getStatus, 1));
+ List<DeviceSite> sites = all.stream()
+ .collect(Collectors.toMap(DeviceSite::getSite, d -> d, (a, b) -> a))
+ .values().stream()
+ .collect(Collectors.toList());
return R.ok(sites);
}
@@ -1036,21 +1388,21 @@
/**
* 鑾峰彇ReceiptDetlsDtos
*/
- private R getAsnOrderItem(List<AsnOrderItem> items) {
+ private R getAsnOrderItem(List<WkOrderItem> items) {
List<ReceiptDetlsDto> detlsDtos = new ArrayList<>();
items.forEach(asnOrderItem -> {
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
- detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+ detlsDto.setAsnCode(asnOrderItem.getOrderCode())
.setId(asnOrderItem.getId())
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
- .setQty(asnOrderItem.getQty())
+ .setQty(QuantityUtils.roundToScale(asnOrderItem.getQty()))
.setStockUnit(asnOrderItem.getStockUnit())
.setPurUnit(asnOrderItem.getPurUnit())
.setPoCode(asnOrderItem.getPoCode())
- .setAnfme(asnOrderItem.getAnfme())
+ .setAnfme(QuantityUtils.roundToScale(asnOrderItem.getAnfme()))
.setPurQty(asnOrderItem.getPurQty())
.setSplrBatch(asnOrderItem.getSplrBatch())
.setExtendFields(asnOrderItem.getExtendFields())
@@ -1081,7 +1433,8 @@
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- detlsDto.setStockQty(stockItem.getAnfme() + stockItem.getWorkQty());
+ Double anfme = QuantityUtils.add(stockItem.getAnfme(), stockItem.getWorkQty());
+ detlsDto.setStockQty(anfme);
}
if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
--
Gitblit v1.9.1