1

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -60,6 +60,13 @@ public class LiteOrderCache {
     @Autowired
     private SmfApi smfApi;
 
+    //最大工单数
+    public   int  MaxOrderCount=1;
+    public boolean SingleOrderMode(){
+        return MaxOrderCount==1;
+    }
+
+
     /**
      * 正在执行的liteOrderMap, key 为orderNo,value 为order
      */

src/main/java/com/neotel/smfcore/custom/hanwha/controller/HanwhaController.java

 package com.neotel.smfcore.custom.hanwha.controller;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.core.order.LiteOrderCache;
+import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.custom.hanwha.handler.TMSApis;
 import com.neotel.smfcore.custom.hanwha.handler.bean.TMSPart;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
@@ -26,6 +30,10 @@ public class HanwhaController {
 
     @Autowired
     private TMSApis apis;
+
+    @Autowired
+    private LiteOrderCache liteOrderCache;
+
     @ApiOperation("requestGetPartInfo")
     @GetMapping("/requestGetPartInfo")
     @AnonymousAccess
@@ -34,4 +42,18 @@ public class HanwhaController {
         List<TMSPart> result= apis.RequestGetPartInfo(0,barcode);
         return  ResultBean.newOkResult(result);
     }
+
+
+    @ApiOperation("更新最大工单数")
+    @GetMapping("/UpdateOrderMode")
+    @AnonymousAccess
+    public ResultBean UpdateOrderMode(@RequestParam Integer maxOrderCount) {
+
+        if(ObjectUtil.isEmpty(maxOrderCount)){
+            return ResultBean.newErrorResult(-1,"Error","Error");
+        }
+        liteOrderCache.MaxOrderCount=maxOrderCount;
+        log.info("UpdateOrderMode 设置 liteOrderCache.MaxOrderCount="+liteOrderCache.MaxOrderCount);
+        return  ResultBean.newOkResult(maxOrderCount);
+    }
 }

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSCommunicator.java

@@ -686,26 +686,27 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
                                 if (ObjectUtil.isNotEmpty(shortValue) && shortValue.equals("true")) {
                                     //查找库存中是否有此物料，如果数量不足返回2003，否则返回2002
 
-                                    List<InventoryItem> itmes = dataCache.getInventoryByPN(item.getPn());
-                                    TMSPart p;
-                                    if (itmes.size() > 0) {
-                                        //如果是有库存但是库存不足，发送2003
-                                        p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2001, "", "");
-                                        log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料,库存不足：code=" + TMS_Code.CODE_2001);
-                                    } else {
-
-                                        //判断pn是否存在，存在返回2002，否则返回2003
-                                        Component component=componentManager.findOneByPN(item.getPn());
-                                        if(component==null){
-                                            //pn不存在，返回2003
-                                            p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2003, "", "");
-                                            log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料，PN不存在：code=" + TMS_Code.CODE_2003);
-                                        }else {
-                                            //库存无此物料，发送2002
-                                            p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2002, "", "");
-                                            log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料，库存无此料：code=" + TMS_Code.CODE_2002);
-                                        }
-                                    }
+                                    TMSPart p=tmsUtil.GetPnTMSPart(requestCmd,parts,item);
+//                                    List<InventoryItem> itmes = dataCache.getInventoryByPN(item.getPn());
+//                                    TMSPart p;
+//                                    if (itmes.size() > 0) {
+//                                        //如果是有库存但是库存不足，发送2003
+//                                        p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2001, "", "");
+//                                        log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料,库存不足：code=" + TMS_Code.CODE_2001);
+//                                    } else {
+//
+//                                        //判断pn是否存在，存在返回2002，否则返回2003
+//                                        Component component=componentManager.findOneByPN(item.getPn());
+//                                        if(component==null){
+//                                            //pn不存在，返回2003
+//                                            p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2003, "", "");
+//                                            log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料，PN不存在：code=" + TMS_Code.CODE_2003);
+//                                        }else {
+//                                            //库存无此物料，发送2002
+//                                            p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2002, "", "");
+//                                            log.info(requestCmd+" pn=" + item.getPn() + ",出库失败缺料，库存无此料：code=" + TMS_Code.CODE_2002);
+//                                        }
+//                                    }
                                     parts.add(p);
                                 } else {
                                     TMSPart p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2010, "", "");
@@ -978,11 +979,11 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
                 }
                 StoragePos pos = storagePosManager.getByPosName(posName);
                 if (pos == null) {
-                    log.info("RequestDeliveryOrderByLocation : cid=" + cid + ", pos=" + posName + ",未找到库位号，出库结果：code=" + TMS_Code.CODE_2002);
-                    posResultMap.put(posName, TMS_Code.CODE_2002);
+                    log.info("RequestDeliveryOrderByLocation : cid=" + cid + ", pos=" + posName + ",未找到库位号，出库结果：code=" + TMS_Code.CODE_2003);
+                    posResultMap.put(posName, TMS_Code.CODE_2003);
                 } else if (pos.getBarcode() == null) {
-                    log.info("RequestDeliveryOrderByLocation : cid=" + cid + ", pos=" + posName + ",库位为空，出库失败，结果：code=" + TMS_Code.CODE_2002);
-                    posResultMap.put(posName, TMS_Code.CODE_2002);
+                    log.info("RequestDeliveryOrderByLocation : cid=" + cid + ", pos=" + posName + ",库位为空，出库失败，结果：code=" + TMS_Code.CODE_2003);
+                    posResultMap.put(posName, TMS_Code.CODE_2003);
                 } else {
                     posResultMap.put(posName, TMS_Code.CODE_1011); //默认是开始送货时失败