10/25 bug 优化 1.0

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

@@ -869,6 +869,14 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(533, "扫码重复或当前追溯码已存在草稿单据中!");
                 }
             }
+            //校验工位库存
+//            List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(addOrderRequest.getBillNo());
+//            for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+//                //校验工位库存
+//                if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){
+//                    return ResultVOUtils.error(500, "当前码库存不足!");
+//                }
+//            }
         }
         //校验预验收是否已存在
         if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
@@ -1029,6 +1037,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
         if (exitLocalEntity == null) {
+            UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
             IoCodeTempEntity codeEnttity = new IoCodeTempEntity();
             codeEnttity.setCode(code);
             codeEnttity.setOrderId(orderId);
@@ -1051,6 +1060,7 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setRelId(addOrderRequest.getRelId());
             codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit());
             codeEnttity.setCount(1);
+            codeEnttity.setPrice(udiRelevanceResponse1.getPrice());
             String unitFk = null;
             if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
                 unitFk = addOrderRequest.getFromCorp();

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

@@ -434,7 +434,7 @@ public class IoOrderController extends BaseController {
                 }
                 //校验工位库存
                 if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){
-                    return ResultVOUtils.error(500, "当前码:库存不足!");
+                    return ResultVOUtils.error(500, "当前码:"+ fifoCodeEntity.getCode()+ "库存不足，请更改码明细!");
                 }
             }
         }

src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java

@@ -36,6 +36,7 @@ public class CollectOrderCodeManResponse {
     private String ggxh;
     private String batchNo;
     private Integer scanCount;
+    private Integer scanActCount;
     private String zczbhhzbapzbh;
     private String manufactory;
     private String productDate;

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.collect;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -213,7 +214,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                 if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
                     ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
                     reviewFinishRequest.setOrderId(collectOrder.getBillNo());
-                    BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
+                    ThreadUtil.execAsync(() -> {
+                        BaseResponse<String> stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + "");
+                    });
                 }
                 updateReview(authAdmin,orderEntity);
             }

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -413,9 +413,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         }
         collectOrderBizService.saveOrUpdate(collectOrderBiz);
 
-
+        int count = 0;
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
-            exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount);
+            exitCode.setScanCount(exitCode.getScanCount() + 1);
+//            exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount);
             exitCode.setBizIdFk(collectOrderBiz.getId());
             this.updateById(exitCode);
         } else {
@@ -434,7 +435,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             .createUser(userId)
                             .updateTime(new Date())
                             .updateUser(userId)
-                            .scanCount(scanCount)
+                            .scanCount(count + 1)
+//                            .scanCount(scanCount)
                             .scanActCount(scanCount)
                             .build();
             this.save(collectOrderCodeMan);

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -205,6 +205,6 @@
             </if>
             and  (pur_apply.status = 3 or saf.status = 3)
         </where>
-#         GROUP BY basic_products.uuid
+        GROUP BY  basic_products.uuid
     </select>
 </mapper>