From 9a3f96bae11e9d4303474996e7097e079649f376 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 13:19:53 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 411 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 262 insertions(+), 149 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 109120c..bdaf340 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
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.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;
@@ -28,10 +29,7 @@
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.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.service.*;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -127,6 +125,10 @@
private CompanysService companysService;
@Autowired
private OutStockService outStockService;
+ @Autowired
+ private WarehouseRoleMenuService warehouseRoleMenuService;
+ @Autowired
+ private BasContainerService basContainerService;
/**
* @return
@@ -233,7 +235,7 @@
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())
@@ -243,20 +245,21 @@
throw new CoolException("鏁版嵁閿欒锛侊紒");
}
if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
- throw new CoolException("鍑哄簱鍗曟湭瀹屾垚锛屾棤娉曞畬鎴愭敹璐э紒锛�");
+ throw new CoolException("璋冩嫈鍑哄簱鍗曟湭瀹屾垚锛屼笉鍙墽琛屾敹璐ф搷浣滐紒锛�");
}
}
if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
- //TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
+ // TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 10000) / 10000.0;
wkOrder.setQty(rcptedQty).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));
+ 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) {
@@ -271,17 +274,20 @@
if (Objects.isNull(dto.getReceiptQty())) {
throw new CoolException("鏀惰揣鏁版嵁涓嶈兘涓虹┖锛侊紒");
}
-// if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
-// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
-// }
-// AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
-// .eq(AsnOrderItem::getAsnCode, asnCode)
-// .eq(AsnOrderItem::getId, dto.getId())
-// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
-// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
+ // if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
+ // throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
+ // }
+ // AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new
+ // LambdaQueryWrapper<AsnOrderItem>()
+ // .eq(AsnOrderItem::getAsnCode, asnCode)
+ // .eq(AsnOrderItem::getId, dto.getId())
+ // .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
+ // .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, dto.getId()));
- //asnOrderItemMapper.resultById(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)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -311,39 +317,41 @@
}
orderItem.setQty(itemRcptQty)
-// .setSplrBatch(dto.getSplrBatch())
+ // .setSplrBatch(dto.getSplrBatch())
.setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
-// if (!Objects.isNull(rcpt)) {
-// try {
-// if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
-// StringBuffer sb = new StringBuffer();
-// if (!dto.getExtendFields().isEmpty()) {
-// dto.getExtendFields().forEach(field -> {
-// field.keySet().forEach(key -> {
-// sb.append(field.get(key));
-// });
-// });
-// }
-// sb.append(dto.getAsnCode() + dto.getMatnr() + dto.getSplrBatch() + orderItem.getIsptResult$());
-// //鑾峰彇16浣島uid
-// String uuid16 = Cools.md5Chinese(sb.toString());
-// rcpt.put("index", uuid16);
-// orderItem.setFieldsIndex(uuid16);
-// }
-// //淇濆瓨鎴栨洿鏂版墿灞曞瓧娈�
-// FieldsUtils.updateFieldsValue(rcpt);
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-// }
+ // if (!Objects.isNull(rcpt)) {
+ // try {
+ // if (Objects.isNull(rcpt.get("fieldsindex")) ||
+ // StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
+ // StringBuffer sb = new StringBuffer();
+ // if (!dto.getExtendFields().isEmpty()) {
+ // dto.getExtendFields().forEach(field -> {
+ // field.keySet().forEach(key -> {
+ // sb.append(field.get(key));
+ // });
+ // });
+ // }
+ // sb.append(dto.getAsnCode() + dto.getMatnr() + dto.getSplrBatch() +
+ // orderItem.getIsptResult$());
+ // //鑾峰彇16浣島uid
+ // String uuid16 = Cools.md5Chinese(sb.toString());
+ // rcpt.put("index", uuid16);
+ // orderItem.setFieldsIndex(uuid16);
+ // }
+ // //淇濆瓨鎴栨洿鏂版墿灞曞瓧娈�
+ // FieldsUtils.updateFieldsValue(rcpt);
+ // } catch (Exception e) {
+ // throw new RuntimeException(e);
+ // }
+ // }
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+ /** 淇濆瓨鏄庣粏鑷虫敹璐у尯 **/
extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
}
@@ -359,11 +367,13 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, 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()));
+ companys = companysService
+ .getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
}
WarehouseAreasItem item = new WarehouseAreasItem();
@@ -379,10 +389,12 @@
.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())
+ .setBatch(StringUtils.isBlank(orderItem.getBatch())
+ ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto)
+ : orderItem.getBatch())
.setAnfme(dto.getReceiptQty())
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
@@ -394,10 +406,10 @@
.setWeight(matnr.getWeight())
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
- //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
+ // TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
-// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+ // .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
.eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
.eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
.eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
@@ -416,29 +428,28 @@
item.setAnfme(anfme);
}
- //鏈川妫�
+ // 鏈川妫�
if (!warehouseAreasItemService.saveOrUpdate(item)) {
throw new CoolException("鏀惰揣澶辫触锛侊紒");
}
-// if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
-//
-// }
-// else {
-// //涓嶅悎鏍兼暟閲�
-// if (orderItem.getDisQty().compareTo(0.00) > 0) {
-// item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
-// if (!warehouseAreasItemService.saveOrUpdate(item)) {
-// throw new CoolException("鏀惰揣澶辫触锛侊紒");
-// }
-// }
-//
-// item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
-// if (!warehouseAreasItemService.saveOrUpdate(item)) {
-// throw new CoolException("鏀惰揣澶辫触锛侊紒");
-// }
-// }
-
+ // if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
+ //
+ // }
+ // else {
+ // //涓嶅悎鏍兼暟閲�
+ // if (orderItem.getDisQty().compareTo(0.00) > 0) {
+ // item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
+ // if (!warehouseAreasItemService.saveOrUpdate(item)) {
+ // throw new CoolException("鏀惰揣澶辫触锛侊紒");
+ // }
+ // }
+ //
+ // item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
+ // if (!warehouseAreasItemService.saveOrUpdate(item)) {
+ // throw new CoolException("鏀惰揣澶辫触锛侊紒");
+ // }
+ // }
}
@@ -454,8 +465,8 @@
throw new CoolException("閫氱煡鍗曚笉鑳戒负绌猴紒锛�");
}
- 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);
+ 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);
WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
.notIn(WkOrder::getExceStatus, shorts)
.eq(WkOrder::getCode, params.getAsnCode()));
@@ -466,8 +477,7 @@
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())
- );
+ .eq(!Cools.isEmpty(params.getMatnrCode()), WkOrderItem::getMatnrCode, params.getMatnrCode()));
if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -493,7 +503,8 @@
*/
@Override
public List<WkOrder> getAllAsnOrders() {
- List<WkOrder> wkOrders = asnOrderMapper.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
+ List<WkOrder> wkOrders = asnOrderMapper.list(
+ new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
return wkOrders;
}
@@ -505,9 +516,39 @@
* @time 2025/3/11 10:12
*/
@Override
- public R getReceiptAreas() {
+ public R getReceiptAreas(User user) {
+ Long[] userRoleIds = user.getUserRoleIds();
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
+ .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(userRoleIds)));
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ List<Long> longs = warehouseRoleMenusSet.stream().map(WarehouseRoleMenu::getMenuId)
+ .collect(Collectors.toList());
List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
+ .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type)
+ .in(WarehouseAreas::getId, longs));
+ return R.ok(areas);
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鑾峰彇闆嗚揣鍖�
+ * @time 2025/3/11 10:12
+ */
+ @Override
+ public R getAreasUserAll(User user) {
+ Long[] userRoleIds = user.getUserRoleIds();
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
+ .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(userRoleIds)));
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ List<Long> longs = warehouseRoleMenusSet.stream().map(WarehouseRoleMenu::getMenuId)
+ .collect(Collectors.toList());
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_COLLECTION.type)
+ .in(WarehouseAreas::getId, longs));
return R.ok(areas);
}
@@ -529,7 +570,7 @@
* @param
* @return
* @author Ryan
- * @description 鑾峰彇缁勭洏鏄庣粏
+ * @description 鑾峰彇缁勭洏鏄庣粏锛堟敮鎸佸垎椤靛姞杞芥洿澶氾級
* @time 2025/4/7 16:58
*/
@Override
@@ -544,10 +585,24 @@
.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);
- List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
- list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
- return R.ok(list);
+ .or().eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode)
+ .apply("anfme > work_qty")
+ ;
+
+ long pageNum = 1;
+ long pageSize = 10;
+ if (!Cools.isEmpty(params.get("pageNum"))) {
+ pageNum = Long.parseLong(params.get("pageNum").toString());
+ }
+ if (!Cools.isEmpty(params.get("pageSize"))) {
+ pageSize = Long.parseLong(params.get("pageSize").toString());
+ }
+ // 浣跨敤 MyBatis-Plus Page 鍒嗛〉
+ Page<WarehouseAreasItem> page = new Page<>(pageNum, pageSize);
+ Page<WarehouseAreasItem> resultPage = warehouseAreasItemService.page(page, queryWrapper);
+// List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
+// list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ return R.ok(resultPage);
}
/**
@@ -561,6 +616,17 @@
@Override
public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
return waitPakinService.mergeItems(waitPakin, userId);
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: PDA缁勬嫋
+ * @version 1.0
+ */
+ @Override
+ public WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId) {
+ return waitPakinService.mergeItemsWcs(waitPakin, userId);
}
/**
@@ -589,7 +655,8 @@
}
InspectDetlDto detlDto = new InspectDetlDto();
detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
- List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, code));
+ List<WkOrderItem> orderItems = asnOrderItemMapper
+ .selectList(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
} else {
@@ -597,7 +664,8 @@
orderItems.forEach(dto -> {
InspectItemDto itemDto = new InspectItemDto();
if (!Objects.isNull(dto.getMatnrCode())) {
- Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, dto.getMatnrCode()));
+ Matnr matnr = matnrMapper
+ .selectOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, dto.getMatnrCode()));
itemDto.setGroup(matnr.getGroupCode());
}
itemDto.setMaktx(dto.getMaktx())
@@ -611,7 +679,8 @@
detlDto.setItems(itemDtos);
}
- List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
+ List<IsptHistories> histories = isptHistoriesMapper
+ .selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
detlDto.setHistories(histories);
return R.ok(detlDto);
}
@@ -660,7 +729,8 @@
throw new CoolException("璐ㄦ鍗曟嵁涓嶅瓨鍦紒!");
}
List<QlyIsptItem> isptItems = qlyIsptItemService.list(new LambdaQueryWrapper<QlyIsptItem>()
- .eq(StringUtils.isNotBlank(params.getMatnrCode()), QlyIsptItem::getMatnrCode, StringUtils.isNotBlank(params.getMatnrCode()) ? params.getMatnrCode() : null)
+ .eq(StringUtils.isNotBlank(params.getMatnrCode()), QlyIsptItem::getMatnrCode,
+ StringUtils.isNotBlank(params.getMatnrCode()) ? params.getMatnrCode() : null)
.eq(QlyIsptItem::getIspectId, inspect.getId()));
if (Objects.isNull(isptItems)) {
throw new CoolException("璐ㄦ鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -673,7 +743,7 @@
.setId(isptItem.getId())
.setMatnrCode(isptItem.getMatnrCode())
.setMaktx(isptItem.getMaktx())
-// .setDisQty(isptItem.getDisQty())
+ // .setDisQty(isptItem.getDisQty())
.setDlyQty(isptItem.getDlyQty())
.setRcptQty(isptItem.getRcptQty())
.setIsptResult(isptItem.getIsptResult())
@@ -681,7 +751,7 @@
.setSplrName(isptItem.getSplrName())
.setPicPath(isptItem.getPicPath())
.setMemo(isptItem.getMemo());
-// .setSafeQty(isptItem.getSafeQty());
+ // .setSafeQty(isptItem.getSafeQty());
dtos.add(objDto);
});
return R.ok(dtos);
@@ -722,16 +792,15 @@
}
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)) {
throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�");
}
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+ List<WaitPakinItem> waitPakinItems = waitPakinItemService
+ .list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
if (Cools.isEmpty(waitPakinItems)) {
throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏");
}
-
return R.ok(waitPakinItems);
}
@@ -753,7 +822,7 @@
throw new CoolException("鍗曟嵁鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
Long OrderId = params.getItemList().stream().findFirst().get().getOrderId();
- /**鑾峰彇骞冲簱璁㈠崟*/
+ /** 鑾峰彇骞冲簱璁㈠崟 */
WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getId, OrderId)
.eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
@@ -762,12 +831,14 @@
throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
Stock stock = new Stock();
-// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
-// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
-// if (!Objects.isNull(purchase)) {
-// stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
-// }
-// }
+ // if (!Objects.isNull(order.getPoCode()) &&
+ // StringUtils.isNotBlank(order.getPoCode())) {
+ // Purchase purchase = purchaseService.getOne(new
+ // LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
+ // if (!Objects.isNull(purchase)) {
+ // stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
+ // }
+ // }
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
@@ -783,12 +854,12 @@
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
}
- //TODO 骞冲簱涓婃灦绛栫暐闂锛� 1 骞冲簱搴撲綅鏄崟鐙璁★紝杩樻槸涓庝骇搴撲竴璧风敤绫诲瀷鍖哄垎
+ // TODO 骞冲簱涓婃灦绛栫暐闂锛� 1 骞冲簱搴撲綅鏄崟鐙璁★紝杩樻槸涓庝骇搴撲竴璧风敤绫诲瀷鍖哄垎
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, params.getLocCode()));
if (Objects.isNull(loc)) {
throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
}
- //locItemSerivce
+ // locItemSerivce
List<LocItem> locItems = new ArrayList<>();
itemList.forEach(asnOrderItem -> {
LocItem item = new LocItem();
@@ -843,21 +914,24 @@
if (Objects.isNull(task)) {
throw new CoolException("鎷栫洏浠诲姟涓嶅瓨鍦紒锛�");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("鎷栫洏浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
TaskQueueDto queueDto = new TaskQueueDto();
queueDto.setTask(task).setTaskItems(taskItems);
List<Long> list = taskItems.stream().map(TaskItem::getMatnrId).collect(Collectors.toList());
- List<LocAreaMatRela> matRelas = locAreaMatRelaMapper.selectList(new LambdaQueryWrapper<LocAreaMatRela>().in(LocAreaMatRela::getMatnrId,
- list));
+ List<LocAreaMatRela> matRelas = locAreaMatRelaMapper
+ .selectList(new LambdaQueryWrapper<LocAreaMatRela>().in(LocAreaMatRela::getMatnrId,
+ list));
TaskLocAreaDto locAreaDto = new TaskLocAreaDto();
- /**鍒ゆ柇鏄惁涓虹┖*/
+ /** 鍒ゆ柇鏄惁涓虹┖ */
if (matRelas.isEmpty()) {
locAreaDto.setLocs(new ArrayList<>());
} else {
- Long ids = matRelas.stream().map(LocAreaMatRela::getLocId).collect(Collectors.toList()).stream().findFirst().get();
+ Long ids = matRelas.stream().map(LocAreaMatRela::getLocId).collect(Collectors.toList()).stream().findFirst()
+ .get();
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getId, ids));
if (locs.isEmpty()) {
locAreaDto.setLocs(new ArrayList<>());
@@ -890,7 +964,8 @@
if (Objects.isNull(task)) {
throw new CoolException("鎷栫洏浠诲姟涓嶅瓨鍦紒锛�");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (!taskItems.isEmpty()) {
throw new CoolException("鎷栫洏浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -909,17 +984,18 @@
/**
* @param
+ * @param user
* @return
* @author Ryan
* @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
* @time 2025/4/9 16:57
*/
@Override
- public R getItemByContainer(Map<String, Object> params) {
-// if (Objects.isNull(params.get("code"))) {
-// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
-// }
- //鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
+ public R getItemByContainer(Map<String, Object> params, User user) {
+ // 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")) {
@@ -927,16 +1003,44 @@
}
List<WaitPakin> waitPakin = waitPakinService.list(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("鎵樼洏涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
}
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
+ List<Loc> locs = locService
+ .list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
if (!Cools.isEmpty(locs)) {
throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
}
- return R.ok("鎵樼洏鍙敤");
+ List<BasContainer> containers = basContainerService.list();
+ for (BasContainer container : containers) {
+ String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
+ if (params.get("barcode").toString().matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
+ .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(user.getUserRoleIds())));
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ // 鑾峰彇 menuId 闆嗗悎
+ Set<Long> menuIdSet = warehouseRoleMenusSet.stream()
+ .map(WarehouseRoleMenu::getMenuId)
+ .collect(Collectors.toSet());
+ // 鑾峰彇 areaList 骞惰浆鎹负 Long 绫诲瀷鐨� Set
+ List<Integer> areaList = container.getAreas();
+ Set<Long> areaSet = new HashSet<>();
+ if (areaList != null) {
+ areaList.forEach(area -> areaSet.add(area.longValue()));
+ }
+ // 姹備袱涓泦鍚堢殑浜ら泦
+ menuIdSet.retainAll(areaSet);
+
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .in(WarehouseAreas::getId, menuIdSet));
+ return R.ok(areas);
+
+ }
+ }
+ return R.ok(new ArrayList<>());
}
/**
@@ -951,8 +1055,10 @@
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));
+ // 鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
+ // 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(!Cools.isEmpty(params.get("barcode")), WaitPakin::getBarcode, params.get("barcode"))
@@ -963,22 +1069,24 @@
}
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin.getId()));
-// if (pakinItems.isEmpty()) {
-// return R.ok(new ArrayList<>());
-// }
-// List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
-// LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
-// List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
-// for (int i = 0; i < warehouseAreasItems.size(); i++) {
-// for (WaitPakinItem pakinItem : pakinItems) {
-// if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
-// warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
-// }
-// }
-// }
+ // if (pakinItems.isEmpty()) {
+ // return R.ok(new ArrayList<>());
+ // }
+ // List<Long> list =
+ // pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+ // LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new
+ // LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
+ // List<WarehouseAreasItem> warehouseAreasItems =
+ // warehouseAreasItemService.list(queryWrapper);
+ // for (int i = 0; i < warehouseAreasItems.size(); i++) {
+ // for (WaitPakinItem pakinItem : pakinItems) {
+ // if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
+ // warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
+ // }
+ // }
+ // }
return R.ok(pakinItems);
}
-
/**
* @param
@@ -989,7 +1097,8 @@
*/
@Override
public R defectProducts(String trackCode) {
- WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getTrackCode, trackCode));
+ WkOrderItem orderItem = asnOrderItemMapper
+ .selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getTrackCode, trackCode));
return R.ok(orderItem);
}
@@ -1001,11 +1110,13 @@
*/
@Override
public R getPakinInStock(String barcode) {
- WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
+ WaitPakin waitPakin = waitPakinService
+ .getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (Objects.isNull(waitPakin)) {
throw new CoolException("缁勬嫋鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
+ List<WaitPakinItem> pakinItems = waitPakinItemService
+ .list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
if (pakinItems.isEmpty()) {
return R.ok(new ArrayList<>());
}
@@ -1046,7 +1157,8 @@
@Override
public synchronized R generateTask(Map<String, Object> map, Long loginUserId) {
String barcode = map.get("barcode").toString();
- List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
+ List<WaitPakin> waitPakins = waitPakinService
+ .list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (waitPakins.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦� 锛侊紒");
}
@@ -1080,29 +1192,30 @@
.setSplrBatch(asnOrderItem.getSplrBatch())
.setExtendFields(asnOrderItem.getExtendFields())
.setMatnr(asnOrderItem.getMatnrCode())
- .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ .setInspect(asnOrderItem.getIsptResult$()) // 璐ㄦ缁撴灉
.setPlatItemId(asnOrderItem.getPlatItemId());
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪锛侊紒");
}
- //SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
+ // SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
.setMatnrId(matnr.getId());
-// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
-// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
-// if (!Objects.isNull(inspect)) {
-// //set 璐ㄦ缁撴灉
-// detlsDto.setInspect(inspect.getStatus$());
-// }
- //鑾峰彇褰撳墠搴撳瓨淇℃伅
+ // QlyInspect inspect = qlyInspectMapper.selectOne(new
+ // LambdaQueryWrapper<QlyInspect>()
+ // .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
+ // if (!Objects.isNull(inspect)) {
+ // //set 璐ㄦ缁撴灉
+ // detlsDto.setInspect(inspect.getStatus$());
+ // }
+ // 鑾峰彇褰撳墠搴撳瓨淇℃伅
LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
-// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
+ // .eq(LocItem::getOrderItemId, asnOrderItem.getId())
.eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
.eq(LocItem::getBatch, asnOrderItem.getSplrBatch())
.eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
- //SET 褰撳墠搴撳瓨鏁伴噺
+ // SET 褰撳墠搴撳瓨鏁伴噺
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
@@ -1111,10 +1224,11 @@
}
if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
- //鑾峰彇閲囪喘鍗曟槑缁嗕俊鎭�
- PurchaseItem purchaseItem = purchaseItemMapper.selectOne(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, asnOrderItem.getPoDetlId()));
+ // 鑾峰彇閲囪喘鍗曟槑缁嗕俊鎭�
+ PurchaseItem purchaseItem = purchaseItemMapper.selectOne(
+ new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, asnOrderItem.getPoDetlId()));
if (Objects.isNull(purchaseItem)) {
- //SET 骞冲彴琛屽彿
+ // SET 骞冲彴琛屽彿
detlsDto.setPlatformId(purchaseItem.getPlatItemId());
}
}
@@ -1123,6 +1237,5 @@
return R.ok(detlsDtos);
}
-
}
--
Gitblit v1.9.1