|
|
|
@ -876,7 +876,7 @@ public class IoCheckInoutService {
|
|
|
|
|
ioOrderCheckResultResponse.setCount(0);
|
|
|
|
|
ioOrderCheckResultResponse.setScanCount(codeEntity.getReCount());
|
|
|
|
|
UdiProductEntity drug = udiProductDao.findByNameCode(codeEntity.getNameCode());
|
|
|
|
|
if (drug.getProductsType() == 2){
|
|
|
|
|
if (drug.getProductsType() == 2) {
|
|
|
|
|
//药品添加药品数据
|
|
|
|
|
ioOrderCheckResultResponse.setBzgg(drug.getBzgg());
|
|
|
|
|
ioOrderCheckResultResponse.setPrepnUnit(drug.getPrepnUnit());
|
|
|
|
@ -1234,7 +1234,7 @@ public class IoCheckInoutService {
|
|
|
|
|
genInvService.genNorInv(orderEntity.getBillNo());
|
|
|
|
|
orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus());
|
|
|
|
|
//若未拆零预出库单据则进入到拆零队列
|
|
|
|
|
if (orderEntity.getAction().equals("SC72197936495755")) {
|
|
|
|
|
if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) {
|
|
|
|
|
List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
|
|
|
|
|
List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
|
|
|
|
|
if (CollUtil.isNotEmpty(codeList)) {
|
|
|
|
@ -1263,7 +1263,7 @@ public class IoCheckInoutService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
splitFifoCodeService.saveBatch(splitCodeEntities);
|
|
|
|
|
} else if (orderEntity.getAction().equals("SC72249388338364")) {
|
|
|
|
|
} else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) {
|
|
|
|
|
//拆零预出库退回
|
|
|
|
|
List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
|
|
|
|
|
List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
|
|
|
|
|