Merge remote-tracking branch 'origin/smf-core-1131' into smf-core-1131

src/main/java/com/neotel/smfcore/custom/lizhen/rest/TaskRestController.java

+package com.neotel.smfcore.custom.lizhen.rest;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
+import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
+import com.neotel.smfcore.core.system.service.po.DataLog;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+public class TaskRestController{
+
+    @Autowired
+    private IDataLogManager dataLogManager;
+
+    @Autowired
+    private DataCache dataCache;
+
+    @Autowired
+    private IStorageManager storageManager;
+
+
+    @RequestMapping("/putIn")
+    @AnonymousAccess
+    public ResultBean putIn(@RequestBody Map<String,String> paramMap){
+        String barcode = paramMap.get("barcode");
+        String posName = paramMap.get("posName");
+        String cid = paramMap.get("cid");
+        Storage storage = dataCache.getStorage(cid);
+        DataLog dataLog = new DataLog();
+        dataLog.setStorageId(storage.getId());
+        dataLog.setPosName(posName);
+        dataLog.setCid(cid);
+        dataLog.setBarcode(barcode);
+        dataLog.setPartNumber(barcode);
+        dataLog.setType(1);
+        dataLog.setStatus(OP_STATUS.WAIT.name());
+        dataLogManager.save(dataLog);
+        return ResultBean.newOkResult("");
+    }
+
+}
+
+