Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -1,10 +1,17 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehousingOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录入库单信息 前端控制器
@@ -16,6 +23,25 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/warehousingOrder")
 public class WarehousingOrderController {
-
+    @Autowired
+    private IWarehousingOrderService warehousingOrderService;
+    /**
+     * 添加/编辑出库选择货源
+     * @param warehousingOrder
+     * @return
+     */
+    @PostMapping("/editSourceOfGoods")
+    public String editSourceOfGoods(WarehousingOrder warehousingOrder){
+        return warehousingOrderService.editSourceOfGoods(warehousingOrder);
+    }
+    /**
+     * 查看货源-出库
+     * @param inOutWarehouseTaskId
+     * @return
+     */
+    @GetMapping("/getSourceOfGoodsList")
+    public List<WarehousingOrder> getSourceOfGoodsList(String inOutWarehouseTaskId){
+        return warehousingOrderService.getSourceOfGoodsList(inOutWarehouseTaskId);
+    }
 }
 

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import java.util.List;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.awt.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -93,6 +95,10 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      * 预计出库重量（吨）
      */
     private Float estimateOutWarehouseWeight;
+    /**
+     * 本次出库重量（吨）
+     */
+    private Float outWeight;
     /**
      * 实际出库重量（吨）
      */
@@ -151,6 +157,21 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     private String addressUrl;
 
+    @TableField(exist = false)
+    private InOutWarehouseTask inOutWarehouseTask;
+    @TableField(exist = false)
+    private List<WarehousingOrder> orderList;
+    /**
+     * 编号类型(1合同编号2移库编号)
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 任务类型(1出库2退)
+     */
+    @TableField(exist = false)
+    private String taskFlag;
+
 
     @Override
     protected Serializable pkVal() {

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

@@ -2,6 +2,10 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,14 @@ import com.baomidou.mybatisplus.service.IService;
  * @since 2022-05-17
  */
 public interface IWarehousingOrderService extends IService<WarehousingOrder> {
-
+    /**
+     * 添加/编辑出库选择货源
+     * @param warehousingOrder
+     */
+    String editSourceOfGoods(WarehousingOrder warehousingOrder);
+    /**
+     * 查看货源-出库
+     * @param inOutWarehouseTaskId
+     */
+    List<WarehousingOrder> getSourceOfGoodsList(String inOutWarehouseTaskId);
 }

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

@@ -1,10 +1,22 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
+import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehousingOrderMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
+import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehousingOrderService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -16,5 +28,46 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMapper, WarehousingOrder> implements IWarehousingOrderService {
+    @Autowired
+    private IInOutWarehouseTaskService inOutWarehouseTaskService;
+    @Autowired
+    private IWarehousingOrderService warehousingOrderService;
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
+
+    /**
+     * 添加/编辑出库选择货源
+     * @param warehousingOrder
+     */
+    @Override
+    public String editSourceOfGoods(WarehousingOrder warehousingOrder) {
+        List<WarehousingOrder> orderList = warehousingOrder.getOrderList();
+        if(!CollectionUtils.isEmpty(orderList)){
+            for(WarehousingOrder warehousingOrder1 : orderList){
+                WarehousingOrder warehousingOrder2 = this.selectById(warehousingOrder1.getId());
+                //添加出库
+                if("1".equals(warehousingOrder2.getTaskFlag())){
+                    warehousingOrder2.setEstimateOutWarehouseWeight(warehousingOrder2.getEstimateOutWarehouseWeight() + warehousingOrder1.getOutWeight());
+                }
+                //编辑出库
+                else{
+                    warehousingOrder2.setEstimateOutWarehouseWeight(warehousingOrder2.getEstimateOutWarehouseWeight() + warehousingOrder1.getOutWeight() - warehousingOrder2.getOutWeight());
+                }
+                this.updateById(warehousingOrder2);
+            }
 
+        }
+        return "ok";
+    }
+    /**
+     * 查看货源-出库
+     * @param inOutWarehouseTaskId
+     */
+    @Override
+    public List<WarehousingOrder> getSourceOfGoodsList(String inOutWarehouseTaskId) {
+        List<WarehousingOrder> warehousingOrderList = warehousingOrderService.selectList(new EntityWrapper<WarehousingOrder>()
+                    .eq("in_out_warehouse_task_id",inOutWarehouseTaskId)
+                    .eq("delete_flag","0"));
+        return warehousingOrderList;
+    }
 }