1.入库类型修改

2.同一个料架同时操作问题

myproject/src/main/java/com/myproject/webapp/controller/storage/AccShelfController.java

@@ -183,11 +183,16 @@ public class AccShelfController extends BaseController {
      */
     @RequestMapping("/service/store/accShelf/putInCode")
     @ResponseBody
-    public String putInCode(HttpServletRequest request){
+    public synchronized String putInCode(HttpServletRequest request){
         final String cid = request.getParameter("cid");
         String code = request.getParameter("code");
         String workOrderNumber = request.getParameter("workOrderNumber");
         String checkType = request.getParameter("checkType");
+
+        if (Strings.isNullOrEmpty(checkType)){
+            return "入库类型不能为空";
+        }
+
         StoragePos lastPutinPos= lastPutinPosMap.get(cid);
         Storage storage = dataCache.getStorage(cid);
         if(lastPutinPos != null){

myproject/src/main/java/com/myproject/webapp/controller/storage/NLPShelfController.java

@@ -96,6 +96,11 @@ public class NLPShelfController extends BaseController {
         String code = request.getParameter("code");
         String workOrderNumber = request.getParameter("workOrderNumber");
         String checkType = request.getParameter("checkType");
+
+        if (Strings.isNullOrEmpty(checkType)){
+            return "入库类型不能为空";
+        }
+
         Storage storage = dataCache.getStorage(cid);
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         for (DataLog queueTask : queueTasks) {

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -1798,7 +1798,7 @@ public class TaskService implements ITaskService {
             params.put("loc",loc);
             params.put("warehouseId","SG00001");
             params.put("workNo",workOrderNumber);
-            params.put("storageType","");
+            params.put("storageType","10");
             if (StringUtils.isNotEmpty(checkType)){
                 if (checkType.contains("中转仓入库")){
                     params.put("storageType","10");
@@ -1838,8 +1838,11 @@ public class TaskService implements ITaskService {
             params.put("reelId",reelBarcode);
             params.put("ri",reelBarcode);
             params.put("warehouseId","SG00001");
-
+            if (StringUtils.isNotEmpty(workOrderNumber)){
                 params.put("storageType","");
+            } else {
+                params.put("storageType","30");
+            }
             if (StringUtils.isNotEmpty(checkType)) {
                 if (checkType.contains("发2003")) {
                     params.put("storageType", "10");
@@ -1853,7 +1856,7 @@ public class TaskService implements ITaskService {
 
             params.put("workNo",workOrderNumber);
 
-            log.info("请求参数为: "+ JSON.serialize(params));
+            log.info("请求参数为: "+ JSON.serialize(params)+",checkType为:"+checkType);
 
             String result = HttpHelper.get(url,params);
             log.info("收到MES ["+ url+"]的关于["+reelBarcode+"]出库通知的反馈信息:"+result);

myproject/src/main/webapp/WEB-INF/pages/storage/accShelf.jsp

@@ -284,9 +284,11 @@
             $("#sizeConfirm").modal("hide");
             var codeValue = $("#scan-code").attr("placeholder");
             var sizeStr = $(this).text();
+            var checkType = getUrlParam("type") || "${tab_zhongzhuanIn}";
+            var workOrder = $.trim($("#work-order-input").val());
             if(codeValue){
                 var newCodeStr = "="+sizeStr+"="+codeValue;
-                $.post("${ctx}/service/store/accShelf/putInCode", {cid: '${show}', code: newCodeStr}, function (data) {
+                $.post("${ctx}/service/store/accShelf/putInCode", {cid: '${show}', code: newCodeStr,workOrderNumber: workOrder, checkType: checkType}, function (data) {
                     showMsg(data);
                 });
             }

myproject/src/main/webapp/WEB-INF/pages/storage/nlpShelf.jsp

@@ -284,10 +284,12 @@
         $(".psizeBox").click(function(){
             $("#sizeConfirm").modal("hide");
             var codeValue = $("#scan-code").attr("placeholder");
+            var checkType = getUrlParam("type") || "${tab_zhongzhuanIn}"; // 添加这一行
+            var workOrder = $.trim($("#work-order-input").val());
             var sizeStr = $(this).text();
             if(codeValue){
                 var newCodeStr = "="+sizeStr+"="+codeValue;
-                $.post("${ctx}/service/store/nlp/putInCode", {cid: '${show}', code: newCodeStr}, function (data) {
+                $.post("${ctx}/service/store/nlp/putInCode", {cid: '${show}', code: newCodeStr,workOrderNumber: workOrder, checkType: checkType}, function (data) {
                     showMsg(data);
                 });
             }

storage.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file