From 18cee3f153e61fb04b17701d63fbd51a9276122a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 09 五月 2025 19:04:01 +0800
Subject: [PATCH] 新增收货单打印预览界面
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 214 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 134 insertions(+), 80 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 8eb849b..4538f27 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
@@ -8,8 +8,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.manager.enums.OrderType;
-import com.vincent.rsf.server.manager.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.enums.WarehouseAreaType;
@@ -20,9 +19,6 @@
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.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
-import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.CodeRes;
@@ -176,12 +172,18 @@
List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getTrackCode, barcode));
-
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
-
- return getAsnOrderItem(asnOrderItem);
+ List<AsnOrderItem> items = new ArrayList<>();
+ for (AsnOrderItem record : asnOrderItem) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ items.add(record);
+ }
+ return getAsnOrderItem(items);
}
/**
@@ -256,7 +258,8 @@
// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- AsnOrderItem orderItem = asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ //asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
@@ -271,20 +274,29 @@
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
- if (!Objects.isNull(rcpt)) {
- try {
- if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
- //鑾峰彇16浣島uid
- String uuid16 = Cools.md5(dto.getBarcode());
- 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("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -325,16 +337,21 @@
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
.setMatnrId(matnr.getId())
+ .setIsptResult(orderItem.getIsptResult())
.setMaktx(matnr.getName())
.setWeight(matnr.getWeight())
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
- .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
+// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
+ .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
+ .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
+ .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
+ .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
.eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
if (!Objects.isNull(serviceOne)) {
+ item.setId(serviceOne.getId());
item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
}
@@ -375,15 +392,7 @@
if (Objects.isNull(params.getAsnCode())) {
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())
- );
- if (Objects.isNull(asnOrderItem)) {
- 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);
AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
@@ -393,7 +402,26 @@
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
- return getAsnOrderItem(asnOrderItem);
+ 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())
+ );
+
+ if (Objects.isNull(asnOrderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ List<AsnOrderItem> items = new ArrayList<>();
+ for (AsnOrderItem record : asnOrderItem) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ items.add(record);
+ }
+
+ return getAsnOrderItem(items);
}
@@ -417,7 +445,8 @@
*/
@Override
public R getReceiptAreas() {
- List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
return R.ok(areas);
}
@@ -430,7 +459,9 @@
*/
@Override
public List<Fields> getDynamicFields() {
- return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
+ return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>()
+ .eq(Fields::getFlagEnable, 1)
+ .eq(Fields::getStatus, 1).orderByAsc(Fields::getId));
}
/**
@@ -444,18 +475,18 @@
public R getDeltByCode(Map<String, Object> params) {
Object code = params.get("code");
Object matnrCode = params.get("matnrCode");
- String batch = null;
- if (!Objects.isNull(params.get("batch"))) {
- batch = params.get("batch").toString();
- }
+ Object asnCode = params.get("asnCode");
+ Object batch = params.get("batch");
+
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
- .eq(!Objects.isNull(code), WarehouseAreasItem::getTrackCode, code)
- .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)
- .eq(!Objects.isNull(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
- .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.list(queryWrapper));
+ 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);
+ List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
+ list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ return R.ok(list);
}
/**
@@ -469,11 +500,6 @@
@Override
public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
return waitPakinService.mergeItems(waitPakin, userId);
- }
-
- @Override
- public WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId) {
- return waitPakinService.mergeMatnrItems(waitPakin, userId);
}
/**
@@ -701,6 +727,8 @@
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setWkType(Short.parseShort(order.getWkType()));
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -719,6 +747,8 @@
.setId(null)
.setLocCode(loc.getCode())
.setOrderId(order.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
.setType(order.getType());
@@ -836,45 +866,68 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("code"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(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 flagDefect = 0;
if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
flagDefect = 1;
}
+ List<WaitPakin> waitPakin = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+// .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()));
+ if (!Cools.isEmpty(locs)) {
+ throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
+ }
+ return R.ok("鎵樼洏鍙敤");
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
+ * @time 2025/4/9 16:57
+ */
+ @Override
+ public R getUnItemByContainer(Map<String, Object> params) {
+ if (Objects.isNull(params.get("barcode"))) {
+ 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(WaitPakin::getFlagDefect, flagDefect)
- .in(WaitPakin::getIoStatus, asList));
+ .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
- return R.ok(new ArrayList<>());
+ return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
}
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin.getId()));
- if (pakinItems.isEmpty()) {
- return R.ok(new ArrayList<>());
- }
- if (!Objects.isNull(params.get("type")) && params.get("type").equals("defective")) {
- return R.ok(pakinItems);
- } else {
- List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .lambda()
- .in(WarehouseAreasItem::getTrackCode, list);
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
- for (int i = 0; i < warehouseAreasItems.size(); i++) {
- for (WaitPakinItem pakinItem : pakinItems) {
- if (warehouseAreasItems.get(i).getTrackCode().equals(pakinItem.getTrackCode())) {
- warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
- }
- }
- }
- return R.ok(warehouseAreasItems);
- }
+// 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
@@ -974,9 +1027,10 @@
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
.setSplrBatch(asnOrderItem.getSplrBatch())
+ .setExtendFields(asnOrderItem.getExtendFields())
.setMatnr(asnOrderItem.getMatnrCode())
.setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
- ;
+ .setPlatItemId(asnOrderItem.getPlatItemId());
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
--
Gitblit v1.9.1