|
@@ -1359,6 +1359,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
else {
|
|
|
throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
|
|
|
}
|
|
|
+ //出库时打入成本
|
|
|
+ CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
|
|
|
+ .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
+ tranCarInfo.setCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
|
|
|
tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
|
|
|
tranCarInfo.setTranType("1");
|
|
|
tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
|
|
@@ -1391,6 +1395,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
if (warehouseInOutInfo.getAddressUrl()!=null) {
|
|
|
tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
|
|
|
}
|
|
|
+ if ("移库出库".equals(warehouseInOutInfo.getInOutType())){
|
|
|
+ //移库出库时打入成本
|
|
|
+ CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
|
|
|
+ .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
+ tranCarInfo.setCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
|
|
|
+ }
|
|
|
tranCarInfo.setLoadingDate(warehouseInOutInfo.getInOutDate());
|
|
|
tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
|
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
@@ -1654,6 +1664,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
}
|
|
|
tranCarInfo.setLoadingDate(warehouseInOutInfo.getInOutDate());
|
|
|
tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
|
|
|
+ //出库时打入成本
|
|
|
+ CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
|
|
|
+ .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
+ tranCarInfo.setCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
|
|
|
tranCarInfo.setStatus(StatusEnum.LOADED.getName());
|
|
|
tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
|
|
|
if ("1".equals(tranCarInfo.getSubmit())) {
|
|
@@ -1692,6 +1706,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
|
|
|
tranCarInfo.setTranType("1");
|
|
|
tranCarInfo.setSubmit("1");
|
|
|
+ //出库时打入成本
|
|
|
+ CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
|
|
|
+ .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
|
|
|
+ tranCarInfo.setCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
|
|
|
tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
|
|
|
tranCarInfo.setLoadingDate(new Date());
|
|
|
tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
|