|
@@ -848,7 +848,8 @@ 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())) {
|
|
|
|
|
|
+ if (!"7".equals(tWarehouseBills.getfBillstatus()) || !"8".equals(tWarehouseBills.getfBillstatus())
|
|
|
|
+ || !"6".equals(tWarehouseBills.getfBillstatus())) {
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
return AjaxResult.error("当前数据不允许暂存");
|
|
return AjaxResult.error("当前数据不允许暂存");
|
|
}
|
|
}
|