From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 14 五月 2025 09:14:43 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 238 ++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 147 insertions(+), 91 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 a81605c..5f955a8 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,7 +2,6 @@ import com.alibaba.fastjson.JSONObject; 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.framework.exception.CoolException; @@ -22,12 +21,14 @@ import com.vincent.rsf.server.manager.mapper.*; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.system.constant.CodeRes; +import com.vincent.rsf.server.system.constant.GlobalConfigCode; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.param.LoginParam; import com.vincent.rsf.server.system.controller.result.LoginResult; 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; @@ -41,6 +42,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -121,6 +124,8 @@ private LocAreaMapper locAreaMapper; @Autowired private DeviceSiteMapper deviceSiteMapper; + @Autowired + private ConfigService configService; /** * @return @@ -172,12 +177,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); } /** @@ -225,11 +236,15 @@ } //TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/ Double rcptedQty = asnOrder.getQty() + receiptQty; - asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val); + asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val); if (!asnOrderMapper.updateById(asnOrder)) { 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) { if (null == rcpt || Objects.isNull(rcpt)) { @@ -261,28 +276,56 @@ if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) { throw new CoolException("鐗╂枡:" + dto.getMaktx() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒"); } + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + if (!Objects.isNull(dto.getProdTime())) { + sdf.parse(dto.getProdTime()); + } + } catch (ParseException e) { + throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒"); + } + Double itemRcptQty = 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) { + throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒"); + } + orderItem.setQty(itemRcptQty) // .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())) { - //鑾峰彇16浣島uid -// String uuid16 = Cools.md5(dto.getBarcode()); - String uuid16 = Cools.md5(dto.getId() + dto.getMatnr()); - 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("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�"); @@ -329,13 +372,21 @@ .setFieldsIndex(orderItem.getFieldsIndex()) .setShipperId(matnr.getShipperId()); //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲 - WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>() + + LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>() // .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())); + .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()); + if (Objects.isNull(orderItem.getIsptResult())) { + queryWrapper.isNull(WarehouseAreasItem::getIsptResult); + } else { + queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult()); + } + + WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper); + if (!Objects.isNull(serviceOne)) { item.setId(serviceOne.getId()); item.setAnfme(item.getAnfme() + serviceOne.getAnfme()); @@ -378,15 +429,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>() @@ -396,7 +439,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); } @@ -434,7 +496,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)); } /** @@ -453,10 +517,10 @@ //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑 LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>() - .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code) - .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch) - .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode) - .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode); + .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); @@ -585,15 +649,15 @@ .setId(isptItem.getId()) .setMatnrCode(isptItem.getMatnrCode()) .setMaktx(isptItem.getMaktx()) - .setDisQty(isptItem.getDisQty()) +// .setDisQty(isptItem.getDisQty()) .setDlyQty(isptItem.getDlyQty()) .setRcptQty(isptItem.getRcptQty()) .setIsptResult(isptItem.getIsptResult()) .setSplrBatch(isptItem.getSplrBatch()) .setSplrName(isptItem.getSplrName()) .setPicPath(isptItem.getPicPath()) - .setMemo(isptItem.getMemo()) - .setSafeQty(isptItem.getSafeQty()); + .setMemo(isptItem.getMemo()); +// .setSafeQty(isptItem.getSafeQty()); dtos.add(objDto); }); return R.ok(dtos); @@ -603,16 +667,17 @@ * 蹇�熻川妫� * * @param params + * @param loginUserId * @return */ @Override - public R checkUpdate(List<QlyIsptItem> params) { + public R checkUpdate(List<QlyIsptItem> params, Long loginUserId) { if (Objects.isNull(params) || params.isEmpty()) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } IsptItemsParams itemsParams = new IsptItemsParams(); itemsParams.setIsptItem(params).setType("0"); - if (qlyIsptItemService.batchUpdate(itemsParams)) { + if (qlyIsptItemService.batchUpdate(itemsParams, loginUserId)) { return R.ok(); } else { return R.error("淇濆瓨澶辫触锛侊紒"); @@ -629,35 +694,22 @@ @Override public R operateToStock(OpStockParams params) { if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) { - throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�"); + throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�"); } - if (StringUtils.isBlank(params.getAsnCode())) { - throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒"); + WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() + .eq(WaitPakin::getBarcode, params.getBarcode()) + .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val) + ); + if (Cools.isEmpty(waitPakin)){ + throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�"); } - if (StringUtils.isBlank(params.getMatnrCode())) { - throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒"); + List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId())); + if (Cools.isEmpty(waitPakinItems)){ + throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏"); } - AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, params.getAsnCode())); - if (Objects.isNull(asnOrders)) { - throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); - } - List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.getBarcode())); - if (!locs.isEmpty()) { - throw new CoolException("鎷栫洏宸蹭娇鐢�"); - } - List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode())); - if (!waitPakins.isEmpty()) { - throw new CoolException("鎷栫洏宸蹭娇鐢�!!"); - } - AsnOrderItem orderItems = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>() - .eq(AsnOrderItem::getAsnId, asnOrders.getId()) - .eq(AsnOrderItem::getMatnrCode, params.getMatnrCode())); - if (Objects.isNull(orderItems)) { - return R.ok(null); - } - orderItems.setBarcode(params.getBarcode()); - return R.ok(orderItems); + + return R.ok(waitPakinItems); } /** @@ -680,7 +732,8 @@ /**鑾峰彇骞冲簱璁㈠崟*/ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>() .eq(AsnOrder::getId, OrderId) - .eq(AsnOrder::getType, OrderType.ORDER_PLAT_IN.type)); + .eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type) + .eq(AsnOrder::getType, OrderType.ORDER_IN.type)); if (Objects.isNull(order)) { throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�"); } @@ -843,20 +896,23 @@ // 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; } - WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() + 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("鎵樼洏鍙敤"); - } else { - throw new CoolException("鎵樼洏涓嶅彲鐢�"); + 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("鎵樼洏鍙敤"); } /** @@ -878,24 +934,24 @@ .eq(WaitPakin::getBarcode, params.get("barcode").toString()) .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<>()); - } - 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(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); } @@ -997,10 +1053,10 @@ .setAnfme(asnOrderItem.getAnfme()) .setPurQty(asnOrderItem.getPurQty()) .setSplrBatch(asnOrderItem.getSplrBatch()) + .setExtendFields(asnOrderItem.getExtendFields()) .setMatnr(asnOrderItem.getMatnrCode()) .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉 - .setPlatItemId(asnOrderItem.getPlatItemId()) - ; + .setPlatItemId(asnOrderItem.getPlatItemId()); Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId()); if (Objects.isNull(matnr)) { -- Gitblit v1.9.1