|
@@ -848,13 +848,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
|
|
JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
|
|
List<TWarehousebillsCntritems> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
|
|
List<TWarehousebillsCntritems> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
|
|
TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
|
|
TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
|
|
- if (!"7".equals(tWarehouseBills.getfBillstatus()) || !"8".equals(tWarehouseBills.getfBillstatus())
|
|
|
|
- || !"6".equals(tWarehouseBills.getfBillstatus())) {
|
|
|
|
|
|
+ if (tWarehouseBills.getfBillstatus()==7L
|
|
|
|
+ || tWarehouseBills.getfBillstatus()==6L) {
|
|
|
|
+ }else {
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
return AjaxResult.error("当前数据不允许暂存");
|
|
return AjaxResult.error("当前数据不允许暂存");
|
|
}
|
|
}
|
|
warehouseBills.setfBillstatus(7L);
|
|
warehouseBills.setfBillstatus(7L);
|
|
- int i = tWarehouseBillsMapper.updateById(warehouseBills);
|
|
|
|
|
|
+ int i = tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
int cntritemsfPid = tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
|
|
int cntritemsfPid = tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
|
|
if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
|
|
if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
|
|
for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntrs) {
|
|
for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntrs) {
|