评审项目添加

cement-business/src/main/java/cn/wise/sc/cement/business/entity/Consumables.java

@@ -59,9 +59,9 @@ public class Consumables implements Serializable {
 	@ApiModelProperty("库存数量 单位：g")
 	private BigDecimal stockNum;
 
-	@ApiModelProperty("入库数量 （单位：瓶）")
+	/*@ApiModelProperty("入库数量 （单位：瓶）")
 	@TableField(exist = false)
-	private BigDecimal enterNum;
+	private BigDecimal enterNum;*/
 
 	@ApiModelProperty("多少g/瓶")
 	private BigDecimal unitStock;

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/ConsumablesServiceImpl.java

@@ -137,22 +137,31 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("消耗品名称不能为空!");
 		}
+		LoginUser loginUser = userService.getLoginUser();
+		if (loginUser == null) {
+			return BaseResponse.noLogin("请登录账号");
+		}
 		QueryWrapper<Consumables> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = consumablesMapper.selectCount(qw);
 		if (count > 0) {
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
-		if(query.getEnterNum() != null && query.getUnitStock() != null){
-			BigDecimal stockNum = query.getEnterNum().multiply(query.getUnitStock());
-			query.setStockNum(stockNum);
-		}else{
-			query.setStockNum(new BigDecimal(0));
+		if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
+			return BaseResponse.errorMsg("每瓶克数必须大于0!");
 		}
-		query.setCreateTime(LocalDateTime.now())
+
+		if(query.getLeastNum().compareTo(new BigDecimal(0)) < 1){
+			return BaseResponse.errorMsg("库存提醒数必须大于0!");
+		}
+
+
+
+		query.setStockNum(new BigDecimal(0))
+				.setCreateTime(LocalDateTime.now())
 				.setStatus(1);
 		consumablesMapper.insert(query);
-		//消耗品入库记录添加
+		/*//消耗品入库记录添加
 		LoginUser loginUser = userService.getLoginUser();
 		ConsumablesEnter enter = new ConsumablesEnter();
 		enter.setConsumablesId(query.getId())
@@ -160,7 +169,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 				.setEnterNum(query.getEnterNum())
 				.setCreateTime(LocalDateTime.now())
 				.setRemark("新增消耗品");
-		consumablesEnterMapper.insert(enter);
+		consumablesEnterMapper.insert(enter);*/
 		return BaseResponse.okData(query);
 	}
 
@@ -183,6 +192,13 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 		if (count > 0) {
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
+		if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
+			return BaseResponse.errorMsg("每瓶克数必须大于0!");
+		}
+
+		if(query.getLeastNum().compareTo(new BigDecimal(0)) < 1){
+			return BaseResponse.errorMsg("库存提醒数必须大于0!");
+		}
 		consumablesMapper.updateById(query);
 		return BaseResponse.okData(query);
 	}
@@ -203,6 +219,14 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 		if (consumables == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		if(query.getEnterNum() != null){
+			if(query.getEnterNum().compareTo(new BigDecimal(0)) < 1){
+				return BaseResponse.errorMsg("入库数量必须大于0!");
+			}
+			BigDecimal enterNums = consumables.getUnitStock().multiply(query.getEnterNum());
+			if(enterNums.compareTo(new BigDecimal(0)) == -1){
+				return BaseResponse.errorMsg("入库信息错误!");
+			}
 			ConsumablesEnter enter = new ConsumablesEnter();
 			enter.setConsumablesId(consumables.getId())
 					.setUserId(userService.getLoginUser().getId())
@@ -212,6 +236,7 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 			consumablesEnterMapper.insert(enter);
 			consumables.setStockNum(consumables.getStockNum().add( consumables.getUnitStock().multiply(enter.getEnterNum())));
 			consumablesMapper.updateById(consumables);
+		}
 		return BaseResponse.okData("新增入库完成");
 	}
 
@@ -231,6 +256,14 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 		if (consumables == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		if(query.getOutNum() != null){
+			if(query.getOutNum().compareTo(new BigDecimal(0)) < 1){
+				return BaseResponse.errorMsg("出库数量必须大于0!");
+			}
+			BigDecimal stockNum = consumables.getStockNum().subtract(query.getOutNum());
+			if(stockNum.compareTo(new BigDecimal(0)) == -1){
+				return BaseResponse.errorMsg("库存不足!");
+			}
 			ConsumablesOut out = new ConsumablesOut();
 			out.setConsumablesId(consumables.getId())
 					.setUserId(userService.getLoginUser().getId())
@@ -240,6 +273,8 @@ public class ConsumablesServiceImpl extends ServiceImpl<ConsumablesMapper, Consu
 			consumablesOutMapper.insert(out);
 			consumables.setStockNum(consumables.getStockNum().subtract(out.getCollectNum()));
 			consumablesMapper.updateById(consumables);
+		}
+
 		return BaseResponse.okData("领用出库完成");
 	}
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -446,7 +446,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if(query.getProjectId() == null){
                 return BaseResponse.errorMsg("请添加项目信息");
             }
-            Project project = projectMapper.selectById(entrust.getProjectId());
+            Project project = projectMapper.selectById(query.getProjectId());
             if(project == null){
                 return BaseResponse.errorMsg("项目信息有误");
             }
@@ -1309,7 +1309,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                 if(query.getProjectId() == null){
                     return BaseResponse.errorMsg("请添加项目信息");
                 }
-                Project project = projectMapper.selectById(entrust.getProjectId());
+                Project project = projectMapper.selectById(query.getProjectId());
                 if(project == null){
                     return BaseResponse.errorMsg("项目信息有误");
                 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java

@@ -79,6 +79,8 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
     private String systemUrl;
     @Resource
     private SupplierMapper supplierMapper;
+    @Resource
+    private EntityEnclosureMapper entityEnclosureMapper;
 
 
     /**
@@ -179,6 +181,14 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (count > 0) {
             return BaseResponse.errorMsg(query.getName() + "已存在");
         }
+        if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
+            return BaseResponse.errorMsg("每瓶克数必须大于0!");
+        }
+
+        if(query.getLeastNum().compareTo(new BigDecimal(0)) < 1){
+            return BaseResponse.errorMsg("库存提醒数必须大于0!");
+        }
+
         Standard standard = new Standard();
         BeanUtils.copyProperties(query, standard);
         //新增时 库存数量直接改为0
@@ -248,6 +258,13 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (count > 0) {
             return BaseResponse.errorMsg(query.getName() + "已存在");
         }
+        if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
+            return BaseResponse.errorMsg("每瓶克数必须大于0!");
+        }
+
+        if(query.getLeastNum().compareTo(new BigDecimal(0)) < 1){
+            return BaseResponse.errorMsg("库存提醒数必须大于0!");
+        }
         Standard standard = new Standard();
         BeanUtils.copyProperties(query, standard);
         /*if(query.getEnterNum() != null && query.getUnitStock() != null){
@@ -287,8 +304,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         return BaseResponse.okData(standard);
     }
 
-    @Resource
-    private EntityEnclosureMapper entityEnclosureMapper;
+
 
     /**
      * 查看历史标样材料信息
@@ -364,7 +380,15 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
             return BaseResponse.errorMsg("数据错误!");
         }
         if(query.getEnterNum() != null){
+            if(query.getEnterNum().compareTo(new BigDecimal(0)) < 1){
+                return BaseResponse.errorMsg("入库数量必须大于0!");
+            }
             BigDecimal enterNums = standard.getUnitStock().multiply(query.getEnterNum());
+            if(enterNums.compareTo(new BigDecimal(0)) == -1){
+                return BaseResponse.errorMsg("入库信息错误!");
+            }
+
+
             StandardEnter enter = new StandardEnter();
             enter.setStandardId(standard.getId())
                     .setUserId(userService.getLoginUser().getId())
@@ -396,6 +420,13 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
             return BaseResponse.errorMsg("数据错误!");
         }
         if(query.getOutNum() != null){
+            if(query.getOutNum().compareTo(new BigDecimal(0)) < 1){
+                return BaseResponse.errorMsg("出库数量必须大于0!");
+            }
+            BigDecimal stockNum = standard.getStockNum().subtract(query.getOutNum());
+            if(stockNum.compareTo(new BigDecimal(0)) == -1){
+                return BaseResponse.errorMsg("库存不足!");
+            }
             StandardOut out = new StandardOut();
             out.setStandardId(standard.getId())
                     .setUserId(userService.getLoginUser().getId())
@@ -403,7 +434,8 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
                     .setCreateTime(LocalDateTime.now())
                     .setRemark(query.getRemark());
             standardOutMapper.insert(out);
-            standard.setStockNum(standard.getStockNum().subtract(out.getCollectNum()));
+
+            standard.setStockNum(stockNum);
             standardMapper.updateById(standard);
         }