物资车入场申请

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -88,8 +88,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
             Page<BillClean> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
-                    .eq("test_location_id", baseLocation.getId());
+            queryWrapper.eq("vistit_type", type).orderByDesc("sub_date").eq("test_location_id", baseLocation.getId());
 
             if ("0".equals(data)) {
                 queryWrapper.in("bill_status", 0, 1, 2);
@@ -101,7 +100,7 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                 queryWrapper.eq("bill_status", 1);
             }
             QueryWrapper<BillClean> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type).orderByDesc("sub_date")
+            queryWrapper2.eq("vistit_type", type).orderByDesc("sub_date")
                     .eq("test_location_id", baseLocation.getId()).eq("bill_status", 0);
 
             return new Result(ResultCode.SUCCESS, cleanMapper.selectPage(page, queryWrapper), cleanMapper.selectCount(queryWrapper2));
@@ -109,11 +108,10 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             Page<CleanDryGoodsVo> cleanDryGoodPage = null;
             Page<CleanDryGoodsVo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", type);
+            queryWrapper.eq("vistit_type", type);
             QueryWrapper<BillDry> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type);
+            queryWrapper2.eq("vistit_type", type);
             QueryWrapper<BillGoodsInventory> queryWrapper3 = new QueryWrapper<>();
-            queryWrapper3.eq("farm_id", farmId);
             if ("0".equals(data)) {
                 String[] s = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 System.out.println("传入自定义sql的位置参数形式：" + s);
@@ -153,9 +151,9 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("vistit_type", type);
+            queryWrapper.eq("vistit_type", type);
             QueryWrapper<BillDry> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId).eq("vistit_type", type);
+            queryWrapper2.eq("vistit_type", type);
             if ("0".equals(data)) {
                 String[] s = {TokenSign.getWorkIdByJwtToken(httpServletRequest)};
                 System.out.println("传入自定义sql的位置参数形式：" + s);

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -304,8 +304,9 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             pageSize = "20";
         }
         Page<BillPcr> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        BaseLocation baseLocation = locationMapper.selectById(TokenSign.getWorkIdByJwtToken(httpServletRequest));
         QueryWrapper<BillPcr> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).orderByDesc("sub_date");
+        queryWrapper.eq("test_location_id",baseLocation.getId()).orderByDesc("sub_date");
         if ("0".equals(type)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -319,7 +320,7 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
             queryWrapper.in("bill_status", 2, 3);
         }
         QueryWrapper<BillPcr> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).orderByDesc("sub_date");
+        queryWrapper2.eq("test_location_id",baseLocation.getId()).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, pcrMapper.selectPage(page, queryWrapper), pcrMapper.selectCount(queryWrapper2));
     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -77,8 +77,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         }
         Page<BillSampling> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         QueryWrapper<BillSampling> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId)
-                .in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date").eq("vistit_type",type);
+        queryWrapper.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date").eq("vistit_type",type);
         if ("0".equals(data)) {
             queryWrapper.in("bill_status", 0, 1, 2, 3);
         }
@@ -93,7 +92,7 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
         }
         QueryWrapper<BillSampling> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("vistit_type", type);
-        queryWrapper2.eq("farm_id", farmId).in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
+        queryWrapper2.in("test_location_id", TokenSign.getWorkIdByJwtToken(httpServletRequest)).orderByDesc("sub_date");
         queryWrapper2.eq("bill_status", 0);
         return new Result(ResultCode.SUCCESS, billSamplingMapper.selectPage(page, queryWrapper), billSamplingMapper.selectCount(queryWrapper2));
     }