修改仓单

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/TradeWarehouseReceiptApplController.java

@@ -79,14 +79,14 @@ public class TradeWarehouseReceiptApplController {
     public TradeWarehouseReceiptAppl getTrageInfo(String id){
         return tradeWarehouseReceiptApplService.getTrageInfo(id);
     }
+
     /**
      * 删除
-     *
      * @return
      */
-    @PostMapping("/deleteTrageInfo")
-    public void deleteTrageInfo(String id){
-         tradeWarehouseReceiptApplService.deleteTrageInfo(id);
+    @PostMapping("/api/deleteTrageInfo")
+    public void deleteTrageInfo(@RequestBody TradeWarehouseReceiptAppl tradeWarehouseReceiptAppl){
+         tradeWarehouseReceiptApplService.deleteTrageInfo(tradeWarehouseReceiptAppl.getId());
     }
 
 

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

@@ -54,6 +54,10 @@ public class WarehousePositionStorageInfo extends BaseModel<WarehousePositionSto
      * 储存量（吨）
      */
     private Float storage;
+    /**
+     * 可用储存量（吨）
+     */
+    private Float useStorage;
 
 
     @Override

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

@@ -11,7 +11,6 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -26,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 
 import java.text.SimpleDateFormat;
@@ -260,11 +257,14 @@ public class TradeWarehouseReceiptApplServiceImpl extends ServiceImpl<TradeWareh
      */
     @Override
     public void deleteTrageInfo(String id){
-        this.deleteById(id);
+        TradeWarehouseReceiptAppl tradeWarehouseReceiptAppl = this.selectById(id);
+        this.deleteById(tradeWarehouseReceiptAppl.getId());
     }
 
 
 
+
+
     /**
      * 可用库存
      *
@@ -287,15 +287,16 @@ public class TradeWarehouseReceiptApplServiceImpl extends ServiceImpl<TradeWareh
         String billNo = "";
         String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
         String month = new SimpleDateFormat("MM", Locale.CHINESE).format(new Date());
+        String day = new SimpleDateFormat("dd",Locale.CHINESE).format(new Date());
         int count = this.selectCount(new EntityWrapper<TradeWarehouseReceiptAppl>()
                 .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId()).and("date(create_date) = curdate()"));
         int maxCount =  count + 1;
         if (maxCount < 10) {
-            billNo = year + month + "00" + maxCount;
+            billNo = year + month + day + "00" + maxCount;
         } else if (maxCount < 100) {
-            billNo = year + month + "0" + maxCount;
+            billNo = year + month + day + "0" + maxCount;
         } else {
-            billNo = year + month + maxCount;
+            billNo = year + month + day + maxCount;
         }
         return billNo;
     }

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

@@ -77,6 +77,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     private ICostManagementInfoService costManagementInfoService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
+    @Autowired
+    private ITradeWarehouseReceiptApplService tradeWarehouseReceiptApplService;
 
     /**
      * 仓库管理页面列表
@@ -1210,6 +1212,20 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                 .eq("position_id", warehousePositionInfo.getId()));
                         if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)){
                             for (WarehousePositionStorageInfo warehousePositionStorageInfo:warehousePositionStorageInfos){
+                                //查询贸易仓单可用储量
+                                Float useWeight = 0f;
+                                List<TradeWarehouseReceiptAppl> tradeWarehouseReceiptAppls = tradeWarehouseReceiptApplService.selectList(new EntityWrapper<TradeWarehouseReceiptAppl>()
+                                        .eq("warehouse_id",warehouseBaseInfo.getId())
+                                        .eq("warehouse_no_id",warehousePositionInfo.getId())
+                                        .eq("goods_name",warehousePositionStorageInfo.getGoodsName())
+                                        .eq("status","待还款"));
+                                if (!CollectionUtils.isEmpty(tradeWarehouseReceiptAppls)){
+                                    for(int i = 0; i < tradeWarehouseReceiptAppls.size(); i++){
+                                        //待还仓单储量和
+                                        useWeight = useWeight + tradeWarehouseReceiptAppls.get(i).getWeight();
+                                    }
+                                }
+                                warehousePositionStorageInfo.setUseStorage(warehousePositionStorageInfo.getStorage()-useWeight);
                                 temp.add(warehousePositionStorageInfo);
                             }
                         }