模块开发12

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagentInStock.java

@@ -43,13 +43,13 @@ public class QualityReagentInStock implements Serializable {
      * 入库数量
      */
     @ApiModelProperty(value = "入库数量",position =3 )
-    private String inValue;
+    private Integer inValue;
 
     /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间",position =4 )
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagentOutStock.java

@@ -43,7 +43,7 @@ public class QualityReagentOutStock implements Serializable {
      * 出库数量
      */
     @ApiModelProperty(value = "出库数量",position = 3)
-    private String outValue;
+    private Integer inValue;
 
     /**
      * 创建时间

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagentStock.java

@@ -41,7 +41,7 @@ public class QualityReagentStock implements Serializable {
      * 库存量
      */
     @ApiModelProperty(value = "库存量",position =2 )
-    private String stock;
+    private Integer stock;
 
 
     @ApiModelProperty(value = "组织id",position =3 )
@@ -53,12 +53,12 @@ public class QualityReagentStock implements Serializable {
 
 
     @ApiModelProperty(value = "最新入库时间", position = 5)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date inTime;
 
 
     @ApiModelProperty(value = "最新出库时间",position = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date outTime;
     private String fnumber;
     private String fspecification;

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentInStockServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.quality.entity.QualityReagentInStock;
 import vip.xiaonuo.quality.entity.QualityReagentStock;
@@ -36,14 +37,21 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
     private QualityReagentStockMapper stockMapper;
 
     @Override
+    @Transactional
     public CommonResult add(QualityReagentInStock inStock) {
         if ("".equals(inStock.getOrgId()) || null == inStock.getOrgId()) {
             return CommonResult.error();
         } else {
-            inStockMapper.insert(inStock);
             QueryWrapper<QualityReagentStock> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", inStock.getOrgId()).eq("reagent", inStock.getReagent());
+            queryWrapper.eq("id", inStock.getId());
             QualityReagentStock stock = stockMapper.selectOne(queryWrapper);
+            QualityReagentInStock qualityReagentInStock = new QualityReagentInStock();
+            qualityReagentInStock.setCreateTime(inStock.getCreateTime());
+            qualityReagentInStock.setInValue(inStock.getInValue());
+            qualityReagentInStock.setOrgId(inStock.getOrgId());
+            qualityReagentInStock.setOrgName(inStock.getOrgName());
+            qualityReagentInStock.setReagent(inStock.getReagent());
+            inStockMapper.insert(qualityReagentInStock);
             if (ObjectUtil.isEmpty(stock)) {
                 QualityReagentStock stock1 = new QualityReagentStock();
                 stock1.setOrgId(inStock.getOrgId());
@@ -52,12 +60,8 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
                 stock1.setStock(inStock.getInValue());
                 stockMapper.insert(stock1);
             } else {
-                String stockStock = stock.getStock();
-                Double aDouble = Double.valueOf(stockStock);
-                String inValue = inStock.getInValue();
-                Double aDouble1 = Double.valueOf(inValue);
-                DecimalFormat def = new DecimalFormat("0.00");
-                stock.setStock(def.format(aDouble + aDouble1));
+                stock.setStock(stock.getStock() + inStock.getInValue());
+                stock.setInTime(new Date());
                 stockMapper.updateById(stock);
             }
         }
@@ -70,11 +74,8 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
         QueryWrapper<QualityReagentStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", inStock.getOrgId()).eq("reagent", inStock.getReagent());
         QualityReagentStock stock = stockMapper.selectOne(queryWrapper);
-        Double aDouble = Double.valueOf(stock.getStock());
-        Double aDouble1 = Double.valueOf(inStock1.getInValue());
-        Double aDouble2 = Double.valueOf(inStock.getInValue());
-        DecimalFormat def = new DecimalFormat("0.00");
-        stock.setStock(def.format(aDouble - aDouble1+aDouble2));
+        stock.setStock(stock.getStock() - inStock1.getInValue()+inStock.getInValue());
+        stock.setInTime(new Date());
         stockMapper.updateById(stock);
         inStockMapper.updateById(inStock);
         return CommonResult.ok();

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentServiceImpl.java

@@ -32,6 +32,7 @@ public class QualityReagentServiceImpl extends ServiceImpl<QualityReagentMapper,
 
     @Autowired
     private QualityReagentMapper reagentMapper;
+
     @Override
     public List<QualityReagent> getList(QualityReagentParam reagentParam) {
         String orgId = reagentParam.getOrgId();