rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:38a9d0471feb8a2870e93f7b6225c721bdeab250
Branches Tags
rakor:develop
rakor:qms/develop
rakor:qms/zhangke
rakor:qms/yf
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template
..
compare: rakor:5f0f7f616f9fc8181ba0a4bfb4f4d7260e3d8450
Branches Tags
rakor:qms/develop
rakor:qms/zhangke
rakor:qms/yf
rakor:develop
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template

No commits in common. "38a9d0471feb8a2870e93f7b6225c721bdeab250" and "5f0f7f616f9fc8181ba0a4bfb4f4d7260e3d8450" have entirely different histories.
38a9d0471f ... 5f0f7f616f

1 changed files with 14 additions and 71 deletions
Show Stats Expand all files Collapse all files

85
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -10,7 +10,6 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.DigestUtil;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nflg.wms.admin.pojo.dto.*; import com.nflg.wms.admin.pojo.dto.*;
import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository; import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
import com.nflg.wms.admin.repository.SrmMaterialReceiptNoScanCodesRepository; import com.nflg.wms.admin.repository.SrmMaterialReceiptNoScanCodesRepository;
@ -126,7 +125,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 送货单列表 * 送货单列表
*
* @param request * @param request
* @return * @return
*/ */
@ -138,7 +136,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 送货单详情 * 送货单详情
*
* @param orderId 订单ID * @param orderId 订单ID
* @return * @return
*/ */
@ -155,7 +152,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 获取扫码的详情信息 * 获取扫码的详情信息
*
* @param orderItemId 订单项ID * @param orderItemId 订单项ID
* @return * @return
*/ */
@ -170,7 +166,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 扫描送货单号获取送货单详情（PDA） * 扫描送货单号获取送货单详情（PDA）
*
* @param orderNo 送货单号 * @param orderNo 送货单号
* @return * @return
*/ */
@ -184,7 +179,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 收货确认(PDA使用) * 收货确认(PDA使用)
*
* @param request * @param request
* @return * @return
*/ */
@ -321,7 +315,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 普通物料的上架任务（PDA） * 普通物料的上架任务（PDA）
*
* @param orederNo 送货单号或是任务单号 * @param orederNo 送货单号或是任务单号
* @return * @return
*/ */
@ -349,7 +342,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 采购物料入库确认（PDA） * 采购物料入库确认（PDA）
*
* @param request * @param request
* @return * @return
*/ */
@ -478,34 +470,12 @@ public class NormalPGIController extends BaseController {
.setSERNR(code.getSerialNumbers())); .setSERNR(code.getSerialNumbers()));
scanCodes.add(code); scanCodes.add(code);
// WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster() WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster()
// .setBarcodeCode(code.getCodeId())
// .setBarcodeType((short) 1)
// .setProcessStage(BarCodeProcessStage.InBound.getState())
// .setLastScanBy(UserUtil.getUserId())
// .setLastScanByname(UserUtil.getUserName())
// .setLastScanTime(LocalDateTime.now());
WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster();
WmsQrCodeMaster existCode = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
.one();
if (existCode != null) {
wmsQrCodeMaster = existCode;
} else {
wmsQrCodeMaster.setId(IdWorker.getId());
}
wmsQrCodeMaster
.setBarcodeCode(code.getCodeId()) .setBarcodeCode(code.getCodeId())
.setBarcodeType((short) 1)
.setMaterialCode(item.getItemCode())
.setMaterialDescription(item.getItemName())
.setProcessStage(BarCodeProcessStage.InBound.getState()) .setProcessStage(BarCodeProcessStage.InBound.getState())
.setReceiptItemId(item.getId())
.setLastScanBy(UserUtil.getUserId()) .setLastScanBy(UserUtil.getUserId())
.setLastScanByname(UserUtil.getUserName()) .setLastScanByname(UserUtil.getUserName())
.setLastScanTime(LocalDateTime.now()); .setLastScanTime(LocalDateTime.now());
qrCodeMasters.add(wmsQrCodeMaster); qrCodeMasters.add(wmsQrCodeMaster);
if (CollectionUtil.isNotEmpty(qo.getItems())) { if (CollectionUtil.isNotEmpty(qo.getItems())) {
InCostCenterBackSubmitItemQRQO qrqo = qo.getItems() InCostCenterBackSubmitItemQRQO qrqo = qo.getItems()
@ -544,30 +514,15 @@ public class NormalPGIController extends BaseController {
//同步箱码信息到物料码中 //同步箱码信息到物料码中
List<WmsQrCodeMaster> parents = qrCodeMasters List<WmsQrCodeMaster> parents = qrCodeMasters
.stream() .stream()
// .filter(qrCode -> qrCode.getPackagingType() == 1) .filter(qrCode -> qrCode.getPackagingType() == 1)
.filter(qrCode -> qrCode.getPackagingType() != null && qrCode.getPackagingType() == 1)
.toList(); .toList();
// List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery() List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
// .in(WmsQrCodeMaster::getParentBarcodeId, parents .in(WmsQrCodeMaster::getParentBarcodeId, parents
// .stream() .stream()
// .map(WmsQrCodeMaster::getId) .map(WmsQrCodeMaster::getId)
// .toList() .toList()
// ) )
// .list(); .list();
List<WmsQrCodeMaster> children;
if (CollectionUtil.isNotEmpty(parents)) {
children = qrCodeMasterService.lambdaQuery()
.in(WmsQrCodeMaster::getParentBarcodeId,
parents.stream()
.map(WmsQrCodeMaster::getId)
.toList()
)
.list();
} else {
children = new ArrayList<>();
}
parents.forEach(p -> { parents.forEach(p -> {
children.stream() children.stream()
.filter(c -> c.getParentBarcodeId().equals(p.getId())) .filter(c -> c.getParentBarcodeId().equals(p.getId()))
@ -583,8 +538,7 @@ public class NormalPGIController extends BaseController {
}); });
}); });
qrCodeMasters.addAll(children); qrCodeMasters.addAll(children);
// qrCodeMasterService.updateBarCode(qrCodeMasters); qrCodeMasterService.updateBarCode(qrCodeMasters);
qrCodeMasterService.saveOrUpdateBatch(qrCodeMasters);
} }
normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes); normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes);
return ApiResult.success(); return ApiResult.success();
@ -609,7 +563,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 收货直接入库的（未启用储位管理） * 收货直接入库的（未启用储位管理）
*
* @return * @return
*/ */
private void setPoReceiveByIn(SrmMaterialReceiptQO item, private void setPoReceiveByIn(SrmMaterialReceiptQO item,
@ -859,7 +812,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 一键收货查询 * 一键收货查询
*
* @param request * @param request
* @return * @return
*/ */
@ -913,7 +865,7 @@ public class NormalPGIController extends BaseController {
order.getSupplierNum(), order.getSupplierNum(),
item.getItemCode(), item.getPoLineNumber()); item.getItemCode(), item.getPoLineNumber());
VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("当前物料信息【" + item.getItemCode() + "】,订单号【" + item.getPoNum() + "】，供应商【" + order.getSupplierName() + "】在SAP中搜索不到有效信息"); VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("当前物料信息【" + item.getItemCode() + "】,订单号【" + item.getPoNum() + "】，供应商【" + order.getSupplierName() + "】在SAP中搜索不到有效信息");
String batchNumber = NoUtil.getBatchNo(order.getSupplierNum()); String batchNumber =NoUtil.getBatchNo(order.getSupplierNum());
/* /*
(materialInfoInOrder.getLbprt().equals("2") (materialInfoInOrder.getLbprt().equals("2")
|| materialInfoInOrder.getLbprt().equals("4")) ? NoUtil.getBatchNo(order.getSupplierNum()) : ""; || materialInfoInOrder.getLbprt().equals("4")) ? NoUtil.getBatchNo(order.getSupplierNum()) : "";
@ -1036,7 +988,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 一键收货（无码） * 一键收货（无码）
*
* @param request * @param request
* @return * @return
*/ */
@ -1148,7 +1099,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 采购物料上架确认（无码） * 采购物料上架确认（无码）
*
* @param request * @param request
* @return * @return
*/ */
@ -1381,7 +1331,7 @@ public class NormalPGIController extends BaseController {
items.forEach(item -> { items.forEach(item -> {
RLock lock = redissonClient.getLock(StrUtil.format("lock:inventory:{}:{}:{}", item.getDwerk(), item.getLgort2(), item.getMatnr())); RLock lock = redissonClient.getLock(StrUtil.format("lock:inventory:{}:{}:{}", item.getDwerk(), item.getLgort2(), item.getMatnr()));
try { try {
Long itemId = IdUtil.getSnowflakeNextId(); Long itemId=IdUtil.getSnowflakeNextId();
// 等待5秒获取锁，10秒后自动释放 // 等待5秒获取锁，10秒后自动释放
if (lock.tryLock(5, 10, TimeUnit.SECONDS)) { if (lock.tryLock(5, 10, TimeUnit.SECONDS)) {
WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item); WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item);
@ -1393,13 +1343,13 @@ public class NormalPGIController extends BaseController {
} else { } else {
throw new NflgException(STATE.BusinessError, "获取锁失败"); throw new NflgException(STATE.BusinessError, "获取锁失败");
} }
WmsOutProduceTicketItem ticketItem = new WmsOutProduceTicketItem() WmsOutProduceTicketItem ticketItem=new WmsOutProduceTicketItem()
.setId(IdUtil.getSnowflakeNextId()) .setId(IdUtil.getSnowflakeNextId())
.setTicketId(ticket.getId()) .setTicketId(ticket.getId())
.setProduceItemId(itemId) .setProduceItemId(itemId)
.setNum(item.getSqsl()); .setNum(item.getSqsl());
ticketItems.add(ticketItem); ticketItems.add(ticketItem);
item.getQrCodes().forEach(qr -> { item.getQrCodes().forEach(qr->{
WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream() WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream()
.filter(qit -> qit.getBarcodeCode().equals(qr.getCodeId())) .filter(qit -> qit.getBarcodeCode().equals(qr.getCodeId()))
.findFirst() .findFirst()
@ -1449,7 +1399,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 通过打包码获取到打包码的信息 * 通过打包码获取到打包码的信息
*
* @param request * @param request
* @return * @return
*/ */
@ -1468,7 +1417,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 获取打包码对应的送货单信息 * 获取打包码对应的送货单信息
*
* @param request * @param request
* @return * @return
*/ */
@ -1481,7 +1429,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 根据送货单单号和大码的ID获取到具体的物料信息 * 根据送货单单号和大码的ID获取到具体的物料信息
*
* @param request * @param request
* @return * @return
*/ */
@ -1494,7 +1441,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 根据送货单单号和大码的ID获取到具体的物料信息 * 根据送货单单号和大码的ID获取到具体的物料信息
*
* @param request id= 大码的ID * @param request id= 大码的ID
* @return * @return
*/ */
@ -1516,7 +1462,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 通过打包码获取到物料信息 * 通过打包码获取到物料信息
*
* @param request * @param request
* @return * @return
*/ */
@ -1535,7 +1480,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 确认收货(无需扫码) * 确认收货(无需扫码)
*
* @param request * @param request
* @return * @return
*/ */
@ -1738,7 +1682,6 @@ public class NormalPGIController extends BaseController {
/** /**
* 确认收货(需扫码) * 确认收货(需扫码)
*
* @param request * @param request
* @return * @return
*/ */