料架分配逻辑修改

myproject/pom.xml

@@ -549,7 +549,7 @@
     </dependencies>
     </dependencies>
 
 
     <properties>
     <properties>
-        <app.name>myproject</app.name>
+        <app.name>smdbox</app.name>
         <amp.genericCore>true</amp.genericCore>
         <amp.genericCore>true</amp.genericCore>
         <amp.fullSource>false</amp.fullSource>
         <amp.fullSource>false</amp.fullSource>
         <dao.framework>hibernate</dao.framework>
         <dao.framework>hibernate</dao.framework>

myproject/src/main/java/com/myproject/bean/qisda/InquiryShelfBean.java

@@ -365,7 +365,7 @@ public class InquiryShelfBean {
                 }
                 }
             }
             }
             if(maxShelf != null){
             if(maxShelf != null){
-                boolean result =maxShelf.cancelLoc(targetShelfType, barcode);
+                boolean result =maxShelf.cancelLoc(targetShelfType, task);
                 if(result){
                 if(result){
                     log.info("补料盘["+task.getBarcode()+"]任务取消,同类型最大料架" + maxShelf.tempRfid() +"架位置空");
                     log.info("补料盘["+task.getBarcode()+"]任务取消,同类型最大料架" + maxShelf.tempRfid() +"架位置空");
                     updateShelfInfo(maxShelf);
                     updateShelfInfo(maxShelf);

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

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 
 
 
 
 @Controller
 @Controller
-@RequestMapping("/rest/api/qisda")
+@RequestMapping("/rest/api/dcs")
 public class QisdaApiController extends BaseController {
 public class QisdaApiController extends BaseController {
 
 
     @Autowired
     @Autowired