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

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

@@ -725,7 +725,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
 //                    this.updateById(warehousingOrder);
 //                    workflowService.activateInstance(warehousingOrder.getWorkflowId(), warehousingOrder.getId());
 //                }
-        } else if ("1".equals(warehousingOrder.getFlag())) {
+        }
+        else if ("1".equals(warehousingOrder.getFlag())) {
             warehousingOrder.setInventoryStatus(StatusEnum.GRAIN_REVIEWED.getName());
             warehousingOrder.setOperationFlag("盘亏");
             this.billOperateHisService.saveBillOperateHis(warehousingOrder.getId(), NumberConstant.INVENTORY_CHECK, staffName, null,
@@ -1733,26 +1734,31 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
      */
     @Override
     public String dryOut(WarehousingOrder warehousingOrder) {
-        WarehousingOrder warehousingOrder1 = this.selectById(warehousingOrder.getId());
-        warehousingOrder1.setSurplusWeight(warehousingOrder1.getSurplusWeight() - warehousingOrder.getBeforeWeight());
-        this.updateById(warehousingOrder1);
+        List<WarehousingOrder> warehousingOrderList=warehousingOrder.getWarehousingOrderList();
+        Double money=0d;
+        for (WarehousingOrder warehousingOrder1:warehousingOrderList){
+            money=money+warehousingOrder1.getSurplusWeight()*warehousingOrder1.getAvgCost();
+            warehousingOrder1.setSurplusWeight(0d);
+            this.updateById(warehousingOrder1);
+        }
+        Double afterCost=money/warehousingOrder.getAfterWeight();
         WarehousingOrder warehousingOrder2 = new WarehousingOrder();
         warehousingOrder2.setId(IdGenerator.generateUUID());
-        warehousingOrder2.setCompId(warehousingOrder1.getCompId());
-        warehousingOrder2.setBaseId(warehousingOrder1.getBaseId());
-        warehousingOrder2.setIdentifyId(warehousingOrder1.getIdentifyId());
-        warehousingOrder2.setContractNo(warehousingOrder1.getContractNo());
-        warehousingOrder2.setMoveTaskNo(warehousingOrder1.getMoveTaskNo());
-        warehousingOrder2.setWarehouseName(warehousingOrder1.getWarehouseName());
+        warehousingOrder2.setCompId(warehousingOrderList.get(0).getCompId());
+        warehousingOrder2.setBaseId(warehousingOrderList.get(0).getBaseId());
+        warehousingOrder2.setIdentifyId(warehousingOrderList.get(0).getIdentifyId());
+        warehousingOrder2.setContractNo(warehousingOrderList.get(0).getContractNo());
+        warehousingOrder2.setMoveTaskNo(warehousingOrderList.get(0).getMoveTaskNo());
+        warehousingOrder2.setWarehouseName(warehousingOrderList.get(0).getWarehouseName());
         warehousingOrder2.setInType("折干");
-        warehousingOrder2.setGoodsName(warehousingOrder1.getGoodsName().replace("（潮粮）", ""));
-        warehousingOrder2.setGoodsSource(warehousingOrder1.getGoodsSource());
+        warehousingOrder2.setGoodsName(warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", ""));
+        warehousingOrder2.setGoodsSource(warehousingOrderList.get(0).getGoodsSource());
         warehousingOrder2.setInWarehouseWeight(warehousingOrder.getAfterWeight());
         warehousingOrder2.setSurplusWeight(warehousingOrder.getAfterWeight());
         warehousingOrder2.setIssuingTime(new Date());
-        warehousingOrder2.setAvgCost(warehousingOrder.getAfterCost());
+        warehousingOrder2.setAvgCost(afterCost);
         this.insert(warehousingOrder2);
-        CommonSysParameter commonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", warehousingOrder1.getGoodsName()));
+        CommonSysParameter commonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", warehousingOrderList.get(0).getGoodsName()));
         //减去被折转的潮粮库存
         WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                 .eq("position_id", warehousingOrder.getBeforePositionId())
@@ -1763,12 +1769,12 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
         }
         WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
         warehouseInOutInfo.setId(IdGenerator.generateUUID());
-        warehouseInOutInfo.setBaseId(warehousingOrder1.getBaseId());
-        warehouseInOutInfo.setWarehouseName(warehousingOrder1.getWarehouseName());
+        warehouseInOutInfo.setBaseId(warehousingOrderList.get(0).getBaseId());
+        warehouseInOutInfo.setWarehouseName(warehousingOrderList.get(0).getWarehouseName());
         warehouseInOutInfo.setPositionId(warehousingOrder.getBeforePositionId());
         warehouseInOutInfo.setBinNumber(warehousingOrder.getBeforeBinNo());
         warehouseInOutInfo.setInOutFlag("1");
-        warehouseInOutInfo.setGoodsName(warehousingOrder1.getGoodsName());
+        warehouseInOutInfo.setGoodsName(warehousingOrderList.get(0).getGoodsName());
         warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
         warehouseInOutInfo.setNetWeight(warehousingOrder.getBeforeWeight());
         warehouseInOutInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());