Bläddra i källkod

feat:分开查询总码单的sql

lucky 2 månader sedan
förälder
incheckning
3fc064656f

+ 2 - 2
zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeListController.java

@@ -61,11 +61,11 @@ public class ProductCodeListController extends BaseController {
     @GetMapping("/list")
     @ApiOperation(value = "查询产品码单列表")
     public TableDataInfo list(ProductCodeListVO vo) {
-//        List<ProductCodeListVO> list = productCodeListService.selectProductCodeListList(vo);
+        List<ProductCodeListVO> list = productCodeListService.selectProductCodeListList(vo);
         List<ProductCodeListVO> productCodeListVOS = new ArrayList<>();
         if (vo.getOtherStates() == 1) {  // 已打印总码单
             startPage();
-            productCodeListVOS = productCodeListMapper.selectProductCodeListList1(vo);
+            productCodeListVOS = productCodeListMapper.selectProductCodeListList(vo);
 //            productCodeListVOS.addAll(productCodeListVOS1);
         } else { // 未打印总码单
             startPage();;

+ 3 - 5
zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductCodeListServiceImpl.java

@@ -179,12 +179,10 @@ public class ProductCodeListServiceImpl implements IProductCodeListService {
         List<ProductCodeListVO> productCodeListVOS = new ArrayList<>();
         if (vo.getOtherStates() == 1) {  // 已打印总码单
             PageUtils.startPage();
-            List<ProductCodeListVO> productCodeListVOS1 = productCodeListMapper.selectProductCodeListList1(vo);
-            productCodeListVOS.addAll(productCodeListVOS1);
+            productCodeListVOS.addAll(productCodeListMapper.selectProductCodeListList(vo));
         } else { // 未打印总码单
-            PageUtils.startPage();
-            List<ProductCodeListVO> productCodeListVOS1 = productCodeListMapper.selectProductCodeListList1(vo);
-            productCodeListVOS.addAll(productCodeListVOS1);
+
+            productCodeListVOS.addAll(productCodeListMapper.selectProductCodeListList1(vo));
         }
         for (ProductCodeListVO vo1 : productCodeListVOS) {
             // 处理总净重小数位

+ 1 - 1
zkqy-custom-business/src/main/resources/mapper/business/ProductCodeListMapper.xml

@@ -200,7 +200,7 @@
         left join {DBNAME}.warehouse wh on
         pcl.warehouseregion_id=wh.id
         where
-        pcl.other_states = #{otherStates}
+        pcl.other_states = 0
         and parent.id is null
         and pcl.parent_code is not null
         and pcl.del_flag = '0'