|
@@ -803,6 +803,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+ contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
contractManagementInfo.setInOutType("销售出库");
|
|
|
//期货取点价,现货取单价
|
|
|
if (contractManagementInfo.getUnitContractPrice()!=null) {
|
|
@@ -827,6 +828,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
|
|
|
contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
|
|
|
+ contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
|
|
|
contractManagementInfo.setInOutType("移库出库");
|
|
|
temp.add(contractManagementInfo);
|
|
|
}
|
|
@@ -946,6 +948,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+ contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
contractManagementInfo.setInOutType("采购入库");
|
|
|
//期货取点价,现货取单价
|
|
|
contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
@@ -968,6 +971,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
contractManagementInfo1.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
contractManagementInfo1.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+ contractManagementInfo1.setGrade(contractGoodsInfo.getGrade());
|
|
|
contractManagementInfo1.setInOutType("退库");
|
|
|
temp.add(contractManagementInfo1);
|
|
|
}
|
|
@@ -988,6 +992,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
|
|
|
contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
|
|
|
+ contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
|
|
|
contractManagementInfo.setInOutType("移库入库");
|
|
|
temp.add(contractManagementInfo);
|
|
|
}
|