确认明细查询

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -195,8 +195,6 @@ public class IoCodeTempController extends BaseController {
 
         //取药确认
         if (addEnterCodeRequest.getSelectType() != null) {
-            //判断是都绑定灯组
-
             List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
                     .or()
                     .eq(SysOrderLed::getOrderId, "")
@@ -224,7 +222,6 @@ public class IoCodeTempController extends BaseController {
             collectOrderRequest.setBusType(addEnterCodeRequest.getBusType());
             collectOrderRequest.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
             collectOrderRequest.setBillNo(code);
-            collectOrderRequest.setForceAllot(true);
             BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest);
             if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) {
                 collectOrder = collectOrderService.unionSearch(null, null, code);
@@ -3220,4 +3217,5 @@ public class IoCodeTempController extends BaseController {
     }
 
 
+
 }

src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java

@@ -123,10 +123,25 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
                 splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getAvailableCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
                 updateById(splitFifoInv);
             } else {
-                splitFifoInv = IoSplitFifoInv.builder().id(IdUtil.getSnowflakeNextId()).workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode()).deptCode(ioSplitFifoCodeEntity.getDeptCode()).invCode(ioSplitFifoCodeEntity.getInvCode()).productType(ioSplitFifoCodeEntity.getProductType()).fifoSplit(ioSplitFifoCodeEntity.getFifoSplit()).relId(ioSplitFifoCodeEntity.getRelId()).inCodeCount(ioSplitFifoCodeEntity.getScanCount()).batchNo(ioSplitFifoCodeEntity.getBatchNo()).produceDate(ioSplitFifoCodeEntity.getProduceDate()).expireDate(ioSplitFifoCodeEntity.getExpireDate()).supId(ioSplitFifoCodeEntity.getSupId()).inCount(ioSplitFifoCodeEntity.getTotalCount()).outCount(0).reCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).availableCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).lockCount(0).createTime(new Date()).updateTime(new Date()).remark(null).enableRemind(false).invRemindCount(0).workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? setQueueCode(ioSplitFifoCodeEntity.getWorkPlaceCode(), orderEntity.getCreateUser()) : orderEntity.getWorkPlaceQueueCode()).build();
+                splitFifoInv = IoSplitFifoInv.builder()
+                        .id(IdUtil.getSnowflakeNextId()).workPlaceCode(ioSplitFifoCodeEntity.getWorkPlaceCode())
+                        .deptCode(ioSplitFifoCodeEntity.getDeptCode())
+                        .invCode(ioSplitFifoCodeEntity.getInvCode())
+                        .productType(ioSplitFifoCodeEntity.getProductType())
+                        .fifoSplit(ioSplitFifoCodeEntity.getFifoSplit()).relId(ioSplitFifoCodeEntity.getRelId())
+                        .inCodeCount(ioSplitFifoCodeEntity.getScanCount())
+                        .batchNo(ioSplitFifoCodeEntity.getBatchNo())
+                        .produceDate(ioSplitFifoCodeEntity.getProduceDate())
+                        .expireDate(ioSplitFifoCodeEntity.getExpireDate())
+                        .supId(ioSplitFifoCodeEntity.getSupId())
+                        .inCount(ioSplitFifoCodeEntity.getTotalCount()).outCount(0)
+                        .reCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()))
+                        .availableCount(IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())).lockCount(0).createTime(new Date()).updateTime(new Date()).remark(null).enableRemind(false).invRemindCount(0).workPlaceQueueCode(orderEntity.getWorkPlaceQueueCode() == null ? setQueueCode(ioSplitFifoCodeEntity.getWorkPlaceCode(), orderEntity.getCreateUser()) : orderEntity.getWorkPlaceQueueCode()).build();
 //                if (isOnlyInv) {
 //                    splitFifoInv.setBusType(ioSplitFifoCodeEntity.getBusType());
 //                }
+
+                splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount()));
                 save(splitFifoInv);
                 //更新库存工位关联
                 List<SysWorkplacePutRel> sysWorkplacePutRels = sysWorkplacePutRelService.selectByWorkPutCode(orderEntity.getWorkPlaceCode());