|
@@ -2905,8 +2905,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
time = warehousebillsitems.getfBsdate();
|
|
|
}
|
|
|
tWarehousebillsitems.setfChargedate(time);//仓储费计算日期
|
|
|
- tWarehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());//入库时间
|
|
|
- warehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());
|
|
|
if (StringUtils.isNull(warehousebillsitems) || warehousebillsitems.getfBillstatus() != 30L) {
|
|
|
return AjaxResult.error("请确认是该明细数据是否存在,或该明细数据状态异常");
|
|
|
}
|
|
@@ -2916,6 +2914,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
return AjaxResult.error("仓库明细第未找到箱号");
|
|
|
}
|
|
|
if ("SJRK".equals(billsType)) {
|
|
|
+ tWarehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());//入库时间
|
|
|
+ warehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());
|
|
|
// 查询库容量 是否可入库
|
|
|
int m = calculation(warehouseBills.getfWarehouseid(), warehousebillsitems.getfGrossweight());
|
|
|
if (m == 0) {
|