3/28 处理单据优化1.0

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

@@ -203,6 +203,8 @@ public class CollectOrderBizResponse {
 
     private String trdnFlag;
 
+    private Integer shouldCount;
+
 
 
 

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

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.collect.IoCollectOrderBizMapper;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
+import com.glxp.api.service.basic.UdiProductService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,6 +23,10 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
     @Resource
     IoCollectOrderBizMapper collectOrderBizMapper;
 
+    @Resource
+    UdiProductService udiProductService;
+
+
     public List<CollectOrderBizResponse> filterList(CollectOrderBizRequest collectOrderRequest) {
         if (collectOrderRequest == null) {
             return Collections.emptyList();
@@ -35,6 +41,17 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
                 collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse));
             }
         }
+        //设置 应该扫码数量 shouldCount
+        if (data.size() > 0){
+            for (CollectOrderBizResponse collectOrderBizResponse : data){
+                UdiProductEntity product = udiProductService.selectUdiByName(collectOrderBizResponse.getNameCode());
+                Integer myBhxjsl = product.getMyBhxjsl();
+                collectOrderBizResponse.setShouldCount(collectOrderBizResponse.getCount() / myBhxjsl);
+                if (collectOrderBizResponse.getScanCount() == null){
+                    collectOrderBizResponse.setScanCount(0);
+                }
+            }
+        }
         return data;
     }