|
@@ -2771,11 +2771,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
warehouseBills.setfTimes(warehouseBills.getfTimes() + 1);
|
|
warehouseBills.setfTimes(warehouseBills.getfTimes() + 1);
|
|
warehouseBills.setUpdateTime(new Date());
|
|
warehouseBills.setUpdateTime(new Date());
|
|
warehouseBills.setUpdateBy(user.getUserName());
|
|
warehouseBills.setUpdateBy(user.getUserName());
|
|
- tEnclosureMapper.deleteByFPid(fPid);
|
|
|
|
- tWarehousebillsfeesMapper.deleteByFPid(fPid);
|
|
|
|
- tWarehousebillsitemsMapper.deleteByFPid(fPid);
|
|
|
|
|
|
+// tEnclosureMapper.deleteByFPid(fPid);
|
|
|
|
+// tWarehousebillsfeesMapper.deleteByFPid(fPid);
|
|
|
|
+// tWarehousebillsitemsMapper.deleteByFPid(fPid);
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
- tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
|
|
|
|
|
|
+// tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(fPid);
|
|
// 仓储明细
|
|
// 仓储明细
|
|
if (StringUtils.isNotEmpty(tWarehousebillsitems) && !"[]".equals(tWarehousebillsitems)) {
|
|
if (StringUtils.isNotEmpty(tWarehousebillsitems) && !"[]".equals(tWarehousebillsitems)) {
|
|
JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
|
|
JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
|
|
@@ -2810,7 +2810,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
wbItem.setCreateTime(new Date());
|
|
wbItem.setCreateTime(new Date());
|
|
wbItem.setfBillno(warehouseBills.getfBillno());
|
|
wbItem.setfBillno(warehouseBills.getfBillno());
|
|
wbItem.setCreateBy(user.getUserName());
|
|
wbItem.setCreateBy(user.getUserName());
|
|
- tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
|
|
|
|
|
|
+ tWarehousebillsitemsMapper.updateTWarehousebillsitems(wbItem);
|
|
|
|
+// tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 箱型数据
|
|
// 箱型数据
|
|
@@ -2830,7 +2831,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
cntr.setCreateTime(new Date());
|
|
cntr.setCreateTime(new Date());
|
|
cntr.setCreateBy(user.getUserName());
|
|
cntr.setCreateBy(user.getUserName());
|
|
cntr.setfCntrweight(new BigDecimal(0));
|
|
cntr.setfCntrweight(new BigDecimal(0));
|
|
- tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
|
|
|
|
|
|
+ tWarehousebillsCntrMapper.updateTWarehousebillsCntr(cntr);
|
|
|
|
+// tWarehousebillsCntrMapper.insertTWarehousebillsCntr(cntr);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
|
|
if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
|
|
@@ -2846,7 +2848,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
wbCr.setfBsdate(warehouseBills.getfBsdate());
|
|
}
|
|
}
|
|
- tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
|
|
|
|
+// tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
|
|
|
|
+ tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbCr);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
|
|
if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
|
|
@@ -2863,7 +2866,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
if (StringUtils.isNotNull(warehouseBills.getfBsdate())) {
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
wbDr.setfBsdate(warehouseBills.getfBsdate());
|
|
}
|
|
}
|
|
- tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
|
|
|
|
+// tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
|
|
|
|
+ tWarehousebillsfeesMapper.updateTWarehousebillsfees(wbDr);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
|
|
if (StringUtils.isNotNull(tEnclosure) && !"[]".equals(tEnclosure)) {
|
|
@@ -2876,7 +2880,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
enclosure.setfLineno(lineNo);
|
|
enclosure.setfLineno(lineNo);
|
|
enclosure.setCreateTime(new Date());
|
|
enclosure.setCreateTime(new Date());
|
|
enclosure.setCreateBy(user.getUserName());
|
|
enclosure.setCreateBy(user.getUserName());
|
|
- tEnclosureMapper.insertTEnclosure(enclosure);
|
|
|
|
|
|
+// tEnclosureMapper.insertTEnclosure(enclosure);
|
|
|
|
+ tEnclosureMapper.updateTEnclosure(enclosure);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 创建业务编号 list
|
|
// 创建业务编号 list
|