库位管理界面出库增加标记

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditController.java

@@ -376,7 +376,7 @@ public class SelfAuditController {
                 }
 
                 log.info("处理盘点批次【" + batchNo + "】，料仓【" + storage.getName() + "_" + storage.getCid() + "】位置仓位【" + pos.getPosName() + "】 自动生成出库任务");
-                String outResult = taskService.checkoutTest(storage, pos, true, "selfAudit-clear");
+                String outResult = taskService.checkoutTest(storage, pos, true, "selfAudit-clear",false);
                 if (!Strings.isNullOrEmpty(outResult)) {
                     throw new ValidateException("smfcore.error", outResult);
                 }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -704,8 +704,8 @@ public class StoragePosController {
 //                throw new ValidateException("smfcore.error.getMaterialLot.out", "条码[{0}]验证失败，无法出库", new String[]{pos.getBarcode().getBarcode()});
 //            }
 
-            log.info("库位管理手动出库：出库料仓【" + storage.getName() + "_" + storage.getCid() + "】位置仓位【" + pos.getPosName() + "】");
-            String outResult = taskService.checkoutTest(storage, pos, isSingleOut,SecurityUtils.getCurrentUsername());
+            log.info("库位管理手动出库：出库料仓【" + storage.getName() + "_" + storage.getCid() + "】位置仓位【" + pos.getPosName() + "】,posCheckout=true");
+            String outResult = taskService.checkoutTest(storage, pos, isSingleOut,SecurityUtils.getCurrentUsername(),true);
             if (!Strings.isNullOrEmpty(outResult)) {
                 throw new ValidateException("smfcore.error", outResult);
             }

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -502,10 +502,12 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog>
      * @param <T>
      * @return
      */
-    public <T> T getAppendData(String appendKey){
-        Object value = appendData.get(appendKey);
-        if(value != null){
-            return (T)value;
+    public <T> T getAppendData(String appendKey) {
+        if (appendData != null) {
+            Object value = appendData.get(appendKey);
+            if (value != null) {
+                return (T) value;
+            }
         }
         return null;
     }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -143,7 +143,7 @@ public class TaskService {
     /**
      * 库位出库 测试，空库位也可以出库
      */
-    public synchronized String checkoutTest(Storage storage, StoragePos pos, boolean isSingleOut, String opUserName) throws ValidateException {
+    public synchronized String checkoutTest(Storage storage, StoragePos pos, boolean isSingleOut, String opUserName,boolean posCheckout) throws ValidateException {
 
 
         DataLog task = new DataLog(storage, pos.getBarcode(), pos);
@@ -156,6 +156,9 @@ public class TaskService {
         task.setStatus(OP_STATUS.WAIT.name());
         task.setSingleOut(isSingleOut);
         task.setOperator(opUserName);
+        if(posCheckout){
+            task.updateAppendData("posCheckout",true);
+        }
         addTaskToExecute(task);
         return "";
     }

src/main/java/com/neotel/smfcore/custom/sp/SpApi.java

@@ -18,6 +18,7 @@ import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@ public class SpApi extends BaseSmfApiListener {
 //  codeResolveUrl: http://172.30.11.214:8036/SmartRefrigerator/warehousing
 //  inNotifyUrl: http://172.30.11.214:8036/SmartRefrigerator/warehousingStatus
 //  outNotifyUrl: http://172.30.11.214:8036/SmartRefrigerator/exitWarehouseStatus
+//    taskNotifyUrl: http://172.30.11.214:8036/SmartRefrigerator/exitWarehouseStatus
     @Autowired
     IBarcodeManager barcodeManager;
 
@@ -203,6 +205,12 @@ public class SpApi extends BaseSmfApiListener {
                 paramMap.put("mixRSpeed", mrSpeed + "");
             }
             paramMap.put("currTime", DateUtil.toDateString(new Date(), "yyyy-MM-dd HH:mm:ss"));
+
+            Boolean posCheckout=task.getAppendData("posCheckout");
+            if(posCheckout==null){
+                posCheckout=false;
+            }
+            paramMap.put("posCheckout",posCheckout);
             try {
                 log.info(task.getBarcode() + "出库通知,参数" + JsonUtil.toJsonStr(paramMap));
                 String result = HttpHelper.postJson(outNotifyUrl, paramMap);