Compare commits
No commits in common. "38a9d0471feb8a2870e93f7b6225c721bdeab250" and "5f0f7f616f9fc8181ba0a4bfb4f4d7260e3d8450" have entirely different histories.
38a9d0471f
...
5f0f7f616f
|
|
@ -10,7 +10,6 @@ import cn.hutool.core.util.IdUtil;
|
|||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
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.repository.OutMaterialScanRecordRespository;
|
||||
import com.nflg.wms.admin.repository.SrmMaterialReceiptNoScanCodesRepository;
|
||||
|
|
@ -126,7 +125,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 送货单列表
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -138,7 +136,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 送货单详情
|
||||
*
|
||||
* @param orderId 订单ID
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -155,7 +152,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 获取扫码的详情信息
|
||||
*
|
||||
* @param orderItemId 订单项ID
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -170,7 +166,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 扫描送货单号获取送货单详情（PDA）
|
||||
*
|
||||
* @param orderNo 送货单号
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -184,7 +179,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 收货确认(PDA使用)
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -321,7 +315,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 普通物料的上架任务（PDA）
|
||||
*
|
||||
* @param orederNo 送货单号或是任务单号
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -349,7 +342,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 采购物料入库确认（PDA）
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -478,34 +470,12 @@ public class NormalPGIController extends BaseController {
|
|||
.setSERNR(code.getSerialNumbers()));
|
||||
|
||||
scanCodes.add(code);
|
||||
// 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
|
||||
WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster()
|
||||
.setBarcodeCode(code.getCodeId())
|
||||
.setBarcodeType((short) 1)
|
||||
.setMaterialCode(item.getItemCode())
|
||||
.setMaterialDescription(item.getItemName())
|
||||
.setProcessStage(BarCodeProcessStage.InBound.getState())
|
||||
.setReceiptItemId(item.getId())
|
||||
.setLastScanBy(UserUtil.getUserId())
|
||||
.setLastScanByname(UserUtil.getUserName())
|
||||
.setLastScanTime(LocalDateTime.now());
|
||||
|
||||
qrCodeMasters.add(wmsQrCodeMaster);
|
||||
if (CollectionUtil.isNotEmpty(qo.getItems())) {
|
||||
InCostCenterBackSubmitItemQRQO qrqo = qo.getItems()
|
||||
|
|
@ -544,30 +514,15 @@ public class NormalPGIController extends BaseController {
|
|||
//同步箱码信息到物料码中
|
||||
List<WmsQrCodeMaster> parents = qrCodeMasters
|
||||
.stream()
|
||||
// .filter(qrCode -> qrCode.getPackagingType() == 1)
|
||||
.filter(qrCode -> qrCode.getPackagingType() != null && qrCode.getPackagingType() == 1)
|
||||
.filter(qrCode -> qrCode.getPackagingType() == 1)
|
||||
.toList();
|
||||
// List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
|
||||
// .in(WmsQrCodeMaster::getParentBarcodeId, parents
|
||||
// .stream()
|
||||
// .map(WmsQrCodeMaster::getId)
|
||||
// .toList()
|
||||
// )
|
||||
// .list();
|
||||
|
||||
List<WmsQrCodeMaster> children;
|
||||
if (CollectionUtil.isNotEmpty(parents)) {
|
||||
children = qrCodeMasterService.lambdaQuery()
|
||||
.in(WmsQrCodeMaster::getParentBarcodeId,
|
||||
parents.stream()
|
||||
List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
|
||||
.in(WmsQrCodeMaster::getParentBarcodeId, parents
|
||||
.stream()
|
||||
.map(WmsQrCodeMaster::getId)
|
||||
.toList()
|
||||
)
|
||||
.list();
|
||||
} else {
|
||||
children = new ArrayList<>();
|
||||
}
|
||||
|
||||
parents.forEach(p -> {
|
||||
children.stream()
|
||||
.filter(c -> c.getParentBarcodeId().equals(p.getId()))
|
||||
|
|
@ -583,8 +538,7 @@ public class NormalPGIController extends BaseController {
|
|||
});
|
||||
});
|
||||
qrCodeMasters.addAll(children);
|
||||
// qrCodeMasterService.updateBarCode(qrCodeMasters);
|
||||
qrCodeMasterService.saveOrUpdateBatch(qrCodeMasters);
|
||||
qrCodeMasterService.updateBarCode(qrCodeMasters);
|
||||
}
|
||||
normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes);
|
||||
return ApiResult.success();
|
||||
|
|
@ -609,7 +563,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 收货直接入库的（未启用储位管理）
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
private void setPoReceiveByIn(SrmMaterialReceiptQO item,
|
||||
|
|
@ -859,7 +812,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 一键收货查询
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1036,7 +988,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 一键收货（无码）
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1148,7 +1099,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 采购物料上架确认（无码）
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1449,7 +1399,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 通过打包码获取到打包码的信息
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1468,7 +1417,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 获取打包码对应的送货单信息
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1481,7 +1429,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 根据送货单单号和大码的ID获取到具体的物料信息
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1494,7 +1441,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 根据送货单单号和大码的ID获取到具体的物料信息
|
||||
*
|
||||
* @param request id= 大码的ID
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1516,7 +1462,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 通过打包码获取到物料信息
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1535,7 +1480,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 确认收货(无需扫码)
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
@ -1738,7 +1682,6 @@ public class NormalPGIController extends BaseController {
|
|||
|
||||
/**
|
||||
* 确认收货(需扫码)
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue