1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -172,10 +172,15 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     @TableField(exist = false)
     private List<WarehousePositionInfo> warehousePositionInfoList;
     /**
-     * 质检信息数量包括已删除的
+     * 收购质检信息数量包括已删除的
      */
     @TableField(exist = false)
     private Integer count;
+    /**
+     * 贸易质检信息数量包括已删除的
+     */
+    @TableField(exist = false)
+    private Integer tradeCount;
     @TableField(exist = false)
     private List<PurchasePrice> purchasePriceList;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1304,9 +1304,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         Map<String, Object> pageView = new HashMap<>();
                         pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
                         pageView.put("compId", warehouseBaseInfo.getCompId());
-                        // 查询质检信息包括已删除的
+                        pageView.put("serviceManagementType","3");
+                        // 查询收购质检信息包括已删除的
                         Integer dataCount = baseMapper.getCountByCondition(pageView);
+                        Map<String, Object> pageView1 = new HashMap<>();
+                        pageView1.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                        pageView1.put("compId", warehouseBaseInfo.getCompId());
+                        pageView1.put("serviceManagementType","1");
+                        // 查询贸易质检信息包括已删除的
+                        Integer dataCount1 = baseMapper.getCountByCondition(pageView1);
                         warehouseBaseInfo.setCount(dataCount);
+                        warehouseBaseInfo.setTradeCount(dataCount1);
                         warehouseBaseInfoList.add(warehouseBaseInfo);
                     }
                     break;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -365,6 +365,14 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     public String addTare(WeighingManagement weighingManagement) {
         String relationId=IdGenerator.generateUUID();
         weighingManagement.setId(IdGenerator.generateUUID());
+        //判断质检编号是否唯一
+        List<WeighingManagement> weighingManagementList =
+                this.selectList(new EntityWrapper<WeighingManagement>()
+                        .eq("comp_id",weighingManagement.getCompId())
+                        .eq("number", weighingManagement.getNumber()));
+        if (weighingManagementList.size() > 0) {
+            throw new YException(YExceptionEnum.QUALITY_NO_ERROR);
+        }
         weighingManagement.setRelationId(relationId);
         weighingManagement.setTareDate(new Date());
         weighingManagement.setManagementType("3");
@@ -376,6 +384,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
         qualityInspectionManagement.setRelationId(weighingManagement.getRelationId());
         qualityInspectionManagement.setContractNo(weighingManagement.getContractNo());
+        qualityInspectionManagement.setQualityNo(weighingManagement.getNumber());
         qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
         qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -8,6 +8,7 @@
         FROM quality_inspection_management q
         WHERE
         q.comp_id = #{compId}
+        AND q.service_management_type = #{serviceManagementType}
         AND q.warehouse_name = #{warehouseName}
         AND TO_DAYS(q.create_date) = TO_DAYS(NOW())
     </select>