|
@@ -473,9 +473,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if(wbItem.getfBillstatus()==null){
|
|
|
wbItem.setfBillstatus("1");
|
|
|
notInStorage++;
|
|
|
- }else {
|
|
|
+ }else if(wbItem.getfBillstatus().equals('6')) {
|
|
|
wbItem.setfBillstatus("6");
|
|
|
Stored++;
|
|
|
+ } else if(wbItem.getfBillstatus().equals('1')){
|
|
|
+ wbItem.setfBillstatus("1");
|
|
|
+ notInStorage++;
|
|
|
}
|
|
|
wbItem.setfPid(fPid);
|
|
|
wbItem.setfMarks(warehouseBills.getfMarks());
|
|
@@ -625,6 +628,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
+ @Transactional
|
|
|
public AjaxResult updateCredit(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
|
|
|
Long fPid = null;
|
|
|
if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
|
|
@@ -671,9 +675,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
return AjaxResult.error("库存明细第" + i + "行库存为空");
|
|
|
} else { // 非空修改库存总账
|
|
|
// 库存 < 出库件数 、
|
|
|
- if (tWhgenle.getfQtyblc() < wbItem.getfQty()
|
|
|
-
|
|
|
- ) {
|
|
|
+ if (tWhgenle.getfQtyblc() < wbItem.getfQty() ) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("库存明细第" + i + "行库存不足");
|
|
|
}
|