2/25 查询优化1.0

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -457,6 +457,9 @@ public class IoCollectOrderController extends BaseController {
             //1.校验是否全部自动赋码
             CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
             collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo());
+            if (collectOrderRequest.getIsCheckFinish() != null){
+                collectOrderBizRequest.setIsOrderCheck(collectOrderRequest.getIsCheckFinish());
+            }
             List<CollectOrderBizResponse> collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest);
             boolean isAllTag = collectOrderBizResponses.stream()
                     .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);

src/main/java/com/glxp/api/req/collect/CollectOrderBizRequest.java

@@ -124,4 +124,9 @@ public class CollectOrderBizRequest extends ListPageRequest {
     private String checkCode;
 
     private String udiCode;
+
+    /**
+     *  如果不为null 就是单据审核页面不需要槽位
+     */
+    private Integer isOrderCheck;
 }

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -165,4 +165,8 @@ public class CollectOrderRequest extends ListPageRequest {
     private Boolean forceAllot;
 
 
+    private Integer isCheckFinish;
+
+
+
 }

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

@@ -33,6 +33,7 @@ public class CollectOrderCodeManResponse {
     private Long updateUser;
 
     private String cpmctymc;
+    private String prepnSpec;
     private String ggxh;
     private String batchNo;
     private Integer scanCount;

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

@@ -64,12 +64,15 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
      * 根据单号插入扫码明细
      */
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public void insertCodesByBill(String billNo) {
+    public void insertCodesByBill(String billNo,Integer isCheckFinish) {
 
         IoCollectOrder collectOrder = collectOrderService.getByBillNo(billNo);
 
         CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
         collectOrderBizRequest.setOrderIdFk(billNo);
+        if (isCheckFinish != null){
+            collectOrderBizRequest.setIsOrderCheck(isCheckFinish);
+        }
 
         List<CollectOrderBizResponse> list = collectOrderBizService.filterList(collectOrderBizRequest);
         List<IoCollectOrderCodeAuto> splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 1);
@@ -96,7 +99,7 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
             if (CollUtil.isNotEmpty(temp3)) {
                 saveUnSplitCode(temp3, collectOrder);
             }
-            
+
         }
 
         //有问题

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

@@ -30,8 +30,10 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
             PageHelper.offsetPage(offset, collectOrderRequest.getLimit());
         }
         List<CollectOrderBizResponse> data = collectOrderBizMapper.filterList(collectOrderRequest);
-        for (CollectOrderBizResponse collectOrderBizResponse : data){
+        if (collectOrderRequest.getIsOrderCheck() == null){
-            collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse));
+            for (CollectOrderBizResponse collectOrderBizResponse : data){
+                collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse));
+            }
         }
         return data;
     }

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

@@ -847,7 +847,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         //todo 备份码表
         IoCollectOrder finalCollectOrder = collectOrder;
         //插入到码表
-        collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
+        collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(),collectOrderRequest.getIsCheckFinish());
         //删除原来单据
         removeOrderByBillNo(finalCollectOrder);
         //更新数据至第三方系统
@@ -893,7 +893,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         ThreadUtil.execAsync(() -> {
             //插入到码表
-            collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
+            collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(),null);
             //更新数据至第三方系统
             //单据更新
             ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin);

src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeAutoMapper.xml

@@ -32,6 +32,7 @@
                 AND icoca.fifoSplit = #{fifoSplit}
             </if>
         </where>
+        group by icoca.udiCode
     </select>
     <select id="getScanCount" resultType="java.lang.Integer">
         SELECT COUNT(*)

src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml

@@ -7,6 +7,7 @@
                bp.cpmctymc,
                COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
                bp.bzgg,
+               bp.prepnSpec,
                bp.zczbhhzbapzbh,
                bp.manufactory
         FROM io_collect_order_code_man icocm