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 | 457 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 285 insertions(+), 172 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 3645c2f..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,42 +2,37 @@
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;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.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;
import com.vincent.rsf.server.common.security.JwtSubject;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
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.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;
+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;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +42,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -128,6 +124,8 @@
private LocAreaMapper locAreaMapper;
@Autowired
private DeviceSiteMapper deviceSiteMapper;
+ @Autowired
+ private ConfigService configService;
/**
* @return
@@ -179,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);
}
/**
@@ -197,7 +201,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -216,7 +220,6 @@
}
List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();
- List<WarehouseAreasItem> allOrders = new ArrayList<>();
Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();
@@ -233,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)) {
@@ -254,100 +261,161 @@
// if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
// }
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, asnCode)
- .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
- .eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
+// 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()));
+
+ 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("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
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())
+// .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());
- 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("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
-
- WarehouseAreasItem item = new WarehouseAreasItem();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String format = null;
-// if (Objects.isNull(dto.getProdTime())) {
-// format = dateFormat.format(dto.getProdTime());
-// }
- item.setTrackCode(dto.getBarcode())
- .setAreaName(areasItem.getName())
- .setAreaId(areasItem.getId())
- .setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
- .setProdTime(dto.getProdTime())
- .setWeight(dto.getWeigth())
- //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
- .setUnit(orderItem.getStockUnit())
- .setStockUnit(orderItem.getStockUnit())
- .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
- .setAnfme(dto.getReceiptQty())
- .setSplrBatch(dto.getSplrBatch())
- .setMatnrCode(matnr.getCode())
- .setUpdateBy(loginUserId)
- .setCreateBy(loginUserId)
- .setMatnrId(matnr.getId())
- .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(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
- if (!Objects.isNull(serviceOne)) {
- item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
- item.setId(serviceOne.getId());
- }
-
- if (!warehouseAreasItemService.saveOrUpdate(item)) {
- throw new CoolException("鏀惰揣澶辫触锛侊紒");
- }
+ /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+ extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
}
-// if (!warehouseAreasItemService.saveBatch(allOrders)) {
-// throw new CoolException("鏀惰揣澶辫触锛侊紒");
-// }
-// //鑾峰彇閲囪喘鏁伴噺
-// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
+ if (!asnOrderMapper.updateById(order)) {
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ return R.ok("鏀惰揣鎴愬姛锛侊紒");
+ }
+
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setTrackCode(dto.getBarcode())
+ .setAreaName(areasItem.getName())
+ .setAreaId(areasItem.getId())
+ .setAsnItemId(orderItem.getId())
+ .setAsnCode(asnOrder.getCode())
+ .setAsnId(asnOrder.getId())
+ .setProdTime(dto.getProdTime())
+ .setWeight(dto.getWeigth())
+ //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
+ .setUnit(orderItem.getStockUnit())
+ .setStockUnit(orderItem.getStockUnit())
+ .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
+ .setAnfme(dto.getReceiptQty())
+ .setSplrBatch(dto.getSplrBatch())
+ .setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setMatnrId(matnr.getId())
+ .setIsptResult(orderItem.getIsptResult())
+ .setMaktx(matnr.getName())
+ .setWeight(matnr.getWeight())
+ .setFieldsIndex(orderItem.getFieldsIndex())
+ .setShipperId(matnr.getShipperId());
+ //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
+
+ 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(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());
+ }
+
+ //鏈川妫�
+ if (!warehouseAreasItemService.saveOrUpdate(item)) {
+ throw new CoolException("鏀惰揣澶辫触锛侊紒");
+ }
+
+// if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
//
-// BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
-// //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
-// if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
-// asnOrder.setRleStatus(Short.valueOf("1"));
-// //鏃ュ織琛ㄦ搷浣�
-// operateOrderLogs(asnOrder);
// }
- return R.ok(asnOrder);
+// 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("鏀惰揣澶辫触锛侊紒");
+// }
+// }
+
+
}
/**
@@ -361,13 +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()));
- 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>()
@@ -377,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);
}
@@ -401,7 +482,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);
}
@@ -414,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));
}
/**
@@ -425,13 +509,21 @@
* @time 2025/4/7 16:58
*/
@Override
- public R getDeltByCode(String code) {
+ 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");
+
//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(WarehouseAreasItem::getTrackCode, code)
- .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.getOne(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);
}
/**
@@ -557,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);
@@ -575,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("淇濆瓨澶辫触锛侊紒");
@@ -601,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);
}
/**
@@ -641,7 +721,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R publicToStock(PublicToStockParams params, Long loginUserId) {
+ public synchronized R publicToStock(PublicToStockParams params, Long loginUserId) {
if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {
throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -652,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("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
@@ -672,6 +753,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("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -690,6 +773,8 @@
.setId(null)
.setLocCode(loc.getCode())
.setOrderId(order.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
.setType(order.getType());
@@ -773,7 +858,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R taskGetLocs(String code) throws Exception {
+ public synchronized R taskGetLocs(String code) throws Exception {
if (StringUtils.isBlank(code)) {
throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -807,45 +892,68 @@
*/
@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.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>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
- .lambda()
- .in(WarehouseAreasItem::getTrackCode, list)
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getTrackCode);
- 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
@@ -911,7 +1019,7 @@
* @description 鐢熸垚浠诲姟鍒楄〃
*/
@Override
- public R generateTask(Map<String, Object> map, Long loginUserId) {
+ 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));
if (waitPakins.isEmpty()) {
@@ -934,6 +1042,7 @@
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+ .setId(asnOrderItem.getId())
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
@@ -943,7 +1052,11 @@
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .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)) {
@@ -952,12 +1065,12 @@
//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())
--
Gitblit v1.9.1