From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +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 | 285 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 171 insertions(+), 114 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 a22179e..7cbc8e9 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
@@ -37,6 +37,7 @@
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;
@@ -46,6 +47,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -128,10 +131,10 @@
private DeviceSiteMapper deviceSiteMapper;
/**
+ * @return
* @author Ryan
* @description 鎵嬫寔PDA鐧诲綍鎺ュ彛
* @params LoginParam param锛� HttpServletRequest request
- * @return
* @time 2025/3/10 15:36
*/
@Override
@@ -163,10 +166,10 @@
}
/**
- * @author Ryan
- * @description 鎵爜鑾峰彇鏀惰揣鏄庣粏
* @param barcode
* @return
+ * @author Ryan
+ * @description 鎵爜鑾峰彇鏀惰揣鏄庣粏
* @time 2025/3/10 15:37
*/
@Override
@@ -174,7 +177,10 @@
if (StringUtils.isBlank(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, barcode));
+ List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getTrackCode, barcode));
+
+
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -183,15 +189,16 @@
}
/**
+ * @param params
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鏀惰揣鑷虫敹璐у尯
- * @param params
- * @return
* @time 2025/3/10 15:41
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -210,7 +217,6 @@
}
List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();
- List<WarehouseAreasItem> allOrders = new ArrayList<>();
Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();
@@ -234,7 +240,9 @@
}
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
- if (Objects.isNull(rcpt)) {continue;}
+ if (null == rcpt || Objects.isNull(rcpt)) {
+ continue;
+ }
ReceiptDetlsDto dto = JSONObject.parseObject(JSONObject.toJSONString(rcpt), ReceiptDetlsDto.class);
Matnr matnr = matnrMapper.selectById(dto.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -246,19 +254,24 @@
// 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.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() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ throw new CoolException("鐗╂枡:" + dto.getMaktx() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
orderItem.setQty(itemRcptQty)
- .setSplrBatch(dto.getSplrBatch())
+// .setSplrBatch(dto.getSplrBatch())
+ .setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
@@ -266,7 +279,7 @@
try {
if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
//鑾峰彇16浣島uid
- String uuid16 = CommonUtil.randomUUID16();
+ String uuid16 = Cools.md5(dto.getBarcode());
rcpt.put("index", uuid16);
orderItem.setFieldsIndex(uuid16);
}
@@ -281,59 +294,72 @@
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())
- .setStockUnit(dto.getStockUnit())
- .setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))
- .setAnfme(dto.getReceiptQty())
- .setSplrBatch(dto.getSplrBatch())
- .setMatnrCode(matnr.getCode())
- .setMatnrId(matnr.getId())
- .setMaktx(matnr.getName())
- //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
- .setUnit(dto.getStockUnit())
- .setStockUnit(dto.getStockUnit())
- .setWeight(matnr.getWeight())
- .setFieldsIndex(orderItem.getFieldsIndex())
- .setShipperId(matnr.getShipperId());
- //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
-
- allOrders.add(item);
+ List<QlyIsptItem> isptItems = qlyIsptItemService.list(new LambdaQueryWrapper<QlyIsptItem>().eq(QlyIsptItem::getAsnItemId, dto.getId()));
+ if (isptItems.isEmpty()) {
+ extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
+ } else {
+ for (QlyIsptItem isptItem : isptItems) {
+ extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
+ }
+ }
}
- if (!warehouseAreasItemService.saveBatch(allOrders)) {
+ 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())
+ .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("鏀惰揣澶辫触锛侊紒");
}
-// //鑾峰彇閲囪喘鏁伴噺
-// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
-//
-// 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);
}
/**
- * @author Ryan
- * @description 鍏跺畠鏀惰揣
* @param params
* @return
+ * @author Ryan
+ * @description 鍏跺畠鏀惰揣
*/
@Override
public R otherReceipt(OtherReceiptParams params) {
@@ -342,20 +368,30 @@
}
List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()) ,AsnOrderItem::getTrackCode, params.getTrackCode()));
+ .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>()
+ .notIn(AsnOrder::getExceStatus, shorts)
+ .eq(AsnOrder::getCode, params.getAsnCode()));
+ if (Objects.isNull(order)) {
+ throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
+ }
- return getAsnOrderItem(asnOrderItem);
+ return getAsnOrderItem(asnOrderItem);
}
/**
+ * @return
* @author Ryan
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
- * @return
*/
@Override
public List<AsnOrder> getAllAsnOrders() {
@@ -364,10 +400,10 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇鏀惰揣鍖�
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇鏀惰揣鍖�
* @time 2025/3/11 10:12
*/
@Override
@@ -377,10 +413,10 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇鎵�鏈夊惎鐢ㄥ姩鎬佸瓧娈�
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇鎵�鏈夊惎鐢ㄥ姩鎬佸瓧娈�
* @time 2025/3/12 09:23
*/
@Override
@@ -389,20 +425,26 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇缁勭洏鏄庣粏
* @param
* @return
+ * @author Ryan
+ * @description 鑾峰彇缁勭洏鏄庣粏
* @time 2025/4/7 16:58
*/
@Override
- public R getDeltByCode(String code) {
+ public R getDeltByCode(Map<String, Object> params) {
+ String code = params.get("code").toString();
+ String batch = null;
+ if (!Objects.isNull(params.get("batch"))) {
+ batch = params.get("batch").toString();
+ }
//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, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
- .eq(WarehouseAreasItem::getTrackCode, code)
+ .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(StringUtils.isNotBlank(code), WarehouseAreasItem::getTrackCode, code)
+ .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)
.groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.getOne(queryWrapper));
+ return R.ok(warehouseAreasItemService.getOne(queryWrapper, false));
}
/**
@@ -419,10 +461,10 @@
}
/**
- * @author Ryan
- * @description 瑙ｇ粦
* @param param
* @return
+ * @author Ryan
+ * @description 瑙ｇ粦
*/
@Override
public WaitPakin unBind(WaitPakinParam param) {
@@ -431,6 +473,7 @@
/**
* 鎶ユ鍔熻兘
+ *
* @param code
* @param loginUserId
* @return
@@ -471,10 +514,10 @@
}
/**
- * @author Ryan
- * @description 鎻愪氦鎶ユ
* @param
* @return
+ * @author Ryan
+ * @description 鎻愪氦鎶ユ
* @time 2025/4/1 16:47
*/
@Override
@@ -489,14 +532,15 @@
List<AsnOrder> orders = new ArrayList<>();
orders.add(asnOrder);
if (asnOrderMapper.notifyInspect(orders)) {
- return R.ok("涓婃姤鎴愬姛锛侊紒");
- }else {
+ return R.ok("涓婃姤鎴愬姛锛侊紒");
+ } else {
return R.error("涓婃姤澶辫触锛侊紒");
}
}
/**
* 閫氳繃鐗╂枡锛岃川妫�鍗曡幏鍙栭渶瑕佽川妫�鍗曟嵁
+ *
* @param params
* @return
*/
@@ -507,7 +551,7 @@
}
List<Short> asList = Arrays.asList(QlyIsptStatus.QLY_ISPT_STAS_DONE.val, QlyIsptStatus.QLY_ISPT_STAS_CLOSE.val);
QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .notIn(QlyInspect::getIsptStatus, asList)
+ .notIn(QlyInspect::getIsptStatus, asList)
.eq(QlyInspect::getCode, params.getIsptCode()));
if (Objects.isNull(inspect)) {
throw new CoolException("璐ㄦ鍗曟嵁涓嶅瓨鍦紒!");
@@ -542,6 +586,7 @@
/**
* 蹇�熻川妫�
+ *
* @param params
* @return
*/
@@ -560,12 +605,12 @@
}
/**
- * @author Ryan
- * @description 浜哄伐涓婃灦
- * @param
- * @return
- * @time 2025/4/2 16:33
- */
+ * @param
+ * @return
+ * @author Ryan
+ * @description 浜哄伐涓婃灦
+ * @time 2025/4/2 16:33
+ */
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
@@ -609,7 +654,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("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -654,7 +699,9 @@
itemList.forEach(asnOrderItem -> {
LocItem item = new LocItem();
BeanUtils.copyProperties(asnOrderItem, item);
- item.setId(loc.getId())
+ item.setLocId(loc.getId())
+ .setId(null)
+ .setLocCode(loc.getCode())
.setOrderId(order.getId())
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
@@ -687,6 +734,7 @@
/**
* 鑾峰彇浠诲姟淇℃伅
+ *
* @param code
* @return
*/
@@ -731,14 +779,14 @@
}
/**
- * @Author Ryan
* @param code
- * @desc 浠诲姟涓婃灦
* @return
+ * @Author Ryan
+ * @desc 浠诲姟涓婃灦
*/
@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("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -760,18 +808,21 @@
@Override
public R completeOrder(Long id, Long loginUserId) {
- return asnOrderMapper.completeOrder(id, loginUserId);
+ return asnOrderMapper.completeOrder(id, loginUserId);
}
/**
- * @author Ryan
- * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
* @param
* @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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
Short flagDefect = 0;
@@ -780,7 +831,7 @@
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.get("barcode").toString())
- .eq(WaitPakin::getFlagDefect, flagDefect)
+ .eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
if (Objects.isNull(waitPakin)) {
return R.ok(new ArrayList<>());
@@ -813,10 +864,10 @@
}
/**
- * @author Ryan
- * @description 涓嶈壇鏍囩
* @param
* @return
+ * @author Ryan
+ * @description 涓嶈壇鏍囩
* @time 2025/4/12 08:12
*/
@Override
@@ -826,10 +877,10 @@
}
/**
- * @author Ryan
- * @description 鑾峰彇鍏ュ簱缁勬嫋淇℃伅
* @param barcode
* @return
+ * @author Ryan
+ * @description 鑾峰彇鍏ュ簱缁勬嫋淇℃伅
*/
@Override
public R getPakinInStock(String barcode) {
@@ -845,23 +896,23 @@
}
/**
+ * @return
* @author Ryan
* @description 鑾峰彇搴撳彛绔欑偣淇℃伅
- * @return
*/
@Override
public R getDeviceSites() {
List<DeviceSite> sites = deviceSiteMapper.selectList(new LambdaQueryWrapper<DeviceSite>()
- .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
+ .select(DeviceSite::getId, DeviceSite::getSite, DeviceSite::getName)
.eq(DeviceSite::getStatus, 1)
.groupBy(DeviceSite::getSite, DeviceSite::getId, DeviceSite::getName));
return R.ok(sites);
}
/**
+ * @return
* @author Ryan
* @description 鑾峰彇鎺ㄨ崘搴撲綅
- * @return
*/
@Override
public R getRecommondLocs() {
@@ -876,7 +927,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()) {
@@ -899,14 +950,20 @@
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+ .setId(asnOrderItem.getId())
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
.setQty(asnOrderItem.getQty())
+ .setStockUnit(asnOrderItem.getStockUnit())
+ .setPurUnit(asnOrderItem.getPurUnit())
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .setSplrBatch(asnOrderItem.getSplrBatch())
+ .setMatnr(asnOrderItem.getMatnrCode())
+ .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ ;
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -914,18 +971,18 @@
}
//SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
- .setMatnrId(matnr.getId())
- .setStockUnit(matnr.getStockUnit());
- QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
- if (!Objects.isNull(inspect)) {
- //set 璐ㄦ缁撴灉
- detlsDto.setInspect(inspect.getStatus$());
- }
+ .setMatnrId(matnr.getId());
+// 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::getBatch, asnOrderItem.getBatch())
+// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
+ .eq(LocItem::getFieldsIndex, asnOrderItem.getFieldsIndex())
+ .eq(LocItem::getBatch, asnOrderItem.getSplrBatch())
.eq(LocItem::getMatnrId, asnOrderItem.getMatnrId()));
//SET 褰撳墠搴撳瓨鏁伴噺
if (Objects.isNull(stockItem)) {
--
Gitblit v1.9.1