|
@@ -77,6 +77,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
@Autowired
|
|
|
private BillnoDelMapper billnoDelMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TWarehouseAgreementServiceImpl tWarehouseAgreementService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 查询详情主表
|
|
@@ -354,6 +357,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if (StringUtils.isNull(warehouseBills.getfId())) {
|
|
|
// 如果是新数据
|
|
|
warehouseBills.setCreateBy(loginUser.getUser().getUserName());
|
|
|
+ warehouseBills.setfChargedate(warehouseBills.getfBsdate());
|
|
|
warehouseBills.setfBilltype(billsType);
|
|
|
warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
|
|
|
/*// 提交时: 生流水号
|
|
@@ -377,6 +381,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
fPid = warehouseBills.getfId();
|
|
|
} else {
|
|
|
fPid = warehouseBills.getfId();
|
|
|
+ warehouseBills.setfChargedate(warehouseBills.getfBsdate());
|
|
|
warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
warehouseBills.setUpdateTime(new Date());
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
@@ -721,7 +726,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
// 更新库存总账
|
|
|
updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
|
|
|
- TWarehouseAgreementServiceImpl tWarehouseAgreementService = new TWarehouseAgreementServiceImpl();
|
|
|
long dateDay = DateUtils.getDateDay(tWarehouseBills.getfBsdate(), wbItem.getfBsdate());
|
|
|
long fCorpid = tWarehouseBills.getfCorpid();
|
|
|
TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
|