1

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -582,6 +582,7 @@ public class DataCache {
      */
      */
     public int updateInventoryAmount(String cid,String partNumber,int amount){
     public int updateInventoryAmount(String cid,String partNumber,int amount){
         if(amount != 0){
         if(amount != 0){
+            log.info("updateInventoryAmount : cid="+cid+",pn="+partNumber+",amount="+amount);
             InventoryItem inventoryItem = getStorageInventoryByPartNumber(cid,partNumber);
             InventoryItem inventoryItem = getStorageInventoryByPartNumber(cid,partNumber);
             if(inventoryItem == null){
             if(inventoryItem == null){
                 inventoryItem = new InventoryItem();
                 inventoryItem = new InventoryItem();

src/main/java/com/neotel/smfcore/custom/luxsan_sp/bean/BaseNo.java

@@ -21,6 +21,12 @@ public class BaseNo extends BasePo {
     public boolean isExecuting() {
     public boolean isExecuting() {
         return spareStatus == SpareNostatus.EXECUTING_STATUS;
         return spareStatus == SpareNostatus.EXECUTING_STATUS;
     }
     }
+    public boolean isClosed(){
+        return spareStatus == SpareNostatus.CLOSE_STATUS;
+    }
+    public boolean isAbandon(){
+        return spareStatus == SpareNostatus.ABANDON_STATUS;
+    }
 
 
     public void updateDetailList(SpareNoDetail spareNoDetail) {
     public void updateDetailList(SpareNoDetail spareNoDetail) {
 
 

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java

@@ -176,8 +176,14 @@ public class SpSpareNoController {
             return ResultBean.newErrorResult(-1, "", "未找到对应的入库单信息");
             return ResultBean.newErrorResult(-1, "", "未找到对应的入库单信息");
         }
         }
 
 
-        if (!spareNo.isExecuting()) {
-            return ResultBean.newErrorResult(-1, "", spareNoStr + "入库单正在执行中,不允许放弃");
+//         if (!spareNo.isExecuting()) {
+////            return ResultBean.newErrorResult(-1, "", spareNoStr + "入库单正在执行中,不允许放弃");
+////        }
+        if(spareNo.isConfirmed()||spareNo.isClosed()){
+            return ResultBean.newErrorResult(-1, "", spareNoStr + "已关闭的入库单不允许放弃");
+        }
+        if(spareNo.isAbandon()){
+            return ResultBean.newErrorResult(-1, "", spareNoStr + "入库单已放弃");
         }
         }
 
 
         spareNo.setSpareStatus(SpareNostatus.ABANDON_STATUS);
         spareNo.setSpareStatus(SpareNostatus.ABANDON_STATUS);