杰生重构

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/StockBackDetailsVo.java

@@ -29,4 +29,9 @@ public class StockBackDetailsVo extends StockBackDetails {
      */
     private String materialName;
 
+    /**
+     * 门幅
+     */
+    private Float width;
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockBackController.java

@@ -3,6 +3,7 @@ package com.fjhx.stock.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.material.Material;
 import com.fjhx.entity.stock.StockBack;
 import com.fjhx.entity.stock.StockBackCorrect;
 import com.fjhx.entity.stock.StockBackDetails;
@@ -170,7 +171,6 @@ public class StockBackController {
         return R.success(result);
     }
 
-
     /**
      * 面料退仓看板统计
      */
@@ -199,7 +199,9 @@ public class StockBackController {
         StockBackDetailsVo stockBackDetailsVo = JSONObject.parseObject(stockBackDetails.getFlowData(), StockBackDetailsVo.class);
         String materialId = stockBackDetailsVo.getMaterialId();
         if (materialId != null) {
-            stockBackDetailsVo.setMaterialName(materialService.getById(materialId).getName());
+            Material material = materialService.getById(materialId);
+            stockBackDetailsVo.setMaterialName(material.getName());
+            stockBackDetailsVo.setWidth(material.getWidth());
         }
         return R.success(stockBackDetailsVo);
     }
@@ -210,19 +212,17 @@ public class StockBackController {
 
         stockBackDetails.setFlowStatus(1);
 
-        // 审批跳过
+        // 审批通过
         if (vo.getFlowResult() == 1) {
 
             StockBackDetailsVo flowData = JSONObject.parseObject(stockBackDetails.getFlowData(), StockBackDetailsVo.class);
             stockBackDetails.setMaterialId(flowData.getMaterialId());
             stockBackDetails.setMaterialMeters(flowData.getMaterialMeters());
 
-            if (vo.getOperationTime() != null) {
-                Long stockBackId = stockBackDetails.getStockBackId();
+            if (flowData.getOperationTime() != null) {
                 stockBackService.update(Wrappers.<StockBack>lambdaUpdate()
-                        .eq(StockBack::getId, stockBackId)
-                        .set(StockBack::getOperationTime, vo.getOperationTime())
-                );
+                        .eq(StockBack::getId, stockBackDetails.getStockBackId())
+                        .set(StockBack::getOperationTime, flowData.getOperationTime()));
             }
         }
         stockBackDetailsService.updateById(stockBackDetails);
@@ -230,6 +230,5 @@ public class StockBackController {
         return R.success();
     }
 
-
 }