韩华对接修改

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

@@ -662,38 +662,43 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
                 List<TMSPart> parts = new ArrayList<>();
                 List<TMSPart> parts = new ArrayList<>();
                 for (LiteOrderItem item :
                 for (LiteOrderItem item :
                         liteOrder.getOrderItems()) {
                         liteOrder.getOrderItems()) {
+                    try {
 
 
-                    int curroNum = 0;
+                        int curroNum = 0;
 
 
-                    for (DataLog task :
-                            dataLogs) {
-                        if (task.isCheckOutTask() && task.getSourceName().equals(liteOrder.getOrderNo()) && task.getPartNumber().equals(item.getPn())) {
-                            int requestNum = task.getNum();
-                            curroNum += task.getNum();
-                            if (curroNum > item.getNeedNum()) {
-                                requestNum = task.getNum() - (curroNum - item.getNeedNum());
+                        for (DataLog task :
+                                dataLogs) {
+                            if (task.isCheckOutTask() && task.getSourceName().equals(liteOrder.getOrderNo()) && task.getPartNumber().equals(item.getPn())) {
+                                int requestNum = task.getNum();
+                                curroNum += task.getNum();
+                                if (curroNum > item.getNeedNum()) {
+                                    requestNum = task.getNum() - (curroNum - item.getNeedNum());
+                                }
+                                TMSPart p = TMSPart.newBean(parts.size(), task.getPartNumber(), task.getBarcode(), requestNum, task.getNum(), TMS_Code.CODE_2010, task.getCid(), task.getPosName());
+                                log.info("RequestDeliveryOrder pn=" + task.getPartNumber() + ",出库成功：code=" + TMS_Code.CODE_2010 + ",posName=" + task.getPosName() + ",barcode=" + task.getBarcode());
+                                parts.add(p);
                             }
                             }
-                            TMSPart p = TMSPart.newBean(parts.size(),task.getPartNumber(), task.getBarcode(), requestNum, task.getNum(), TMS_Code.CODE_2010, task.getCid(), task.getPosName());
-                            log.info("RequestDeliveryOrder pn="+task.getPartNumber()+",出库成功：code="+TMS_Code.CODE_2010+",posName="+task.getPosName()+",barcode="+task.getBarcode());
-                            parts.add(p);
                         }
                         }
-                    }
 
 
-                    if (curroNum <= 0) {
-
-                        //如果缺料返回2002，否则还是返回2010
-                        String shortValue=item.getAppend("shortage");
-                        if(ObjectUtil.isNotEmpty(shortValue)&& shortValue.equals("true")){
-                            //未出库
-                            TMSPart p = TMSPart.newBean(parts.size(),item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2002, "", "");
-                            log.info("RequestDeliveryOrder 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, "", "");
-                            log.info("RequestDeliveryOrder pn="+item.getPn()+",未出库成功：code="+TMS_Code.CODE_2010);
-                            parts.add(p);
+                        if (curroNum <= 0) {
+
+                            //如果缺料返回2002，否则还是返回2010
+                            String shortValue = item.getAppend("shortage");
+                            if (ObjectUtil.isNotEmpty(shortValue) && shortValue.equals("true")) {
+                                //未出库
+                                TMSPart p = TMSPart.newBean(parts.size(), item.getPn(), "", item.getNeedNum(), item.getOutNum(), TMS_Code.CODE_2002, "", "");
+                                log.info("RequestDeliveryOrder 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, "", "");
+                                log.info("RequestDeliveryOrder pn=" + item.getPn() + ",未出库成功：code=" + TMS_Code.CODE_2010);
+                                parts.add(p);
+                            }
+
                         }
                         }
 
 
+                    } catch (Exception ex) {
+                        log.error(" RequestDeliveryOrder " + item.getPn() + ",error:" + ex.toString());
                     }
                     }
                 }
                 }
 
 
@@ -718,7 +723,7 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
 
 
 
 
         } catch (Exception exception) {
         } catch (Exception exception) {
-            log.error("RequestDeliveryOrder error:" + exception.getMessage());
+            log.error("RequestDeliveryOrder error:" + exception.toString());
         }
         }
         ResponseDeliveryOrder(requestID, new ArrayList<>(), "");
         ResponseDeliveryOrder(requestID, new ArrayList<>(), "");
     }
     }

src/main/java/com/neotel/smfcore/custom/hanwha/handler/bean/TMSPos.java

@@ -57,10 +57,10 @@ public class TMSPos implements Serializable {
         }
         }
         try {
         try {
             if (posArray.length == 3) {
             if (posArray.length == 3) {
-                rowId = Convert.toInt(posArray[1]) + "";
+                rowId = Convert.toInt(proStr(posArray[1])) + "";
                 colId = Convert.toInt(posArray[2]) + "";
                 colId = Convert.toInt(posArray[2]) + "";
             }else if(posArray.length==4){
             }else if(posArray.length==4){
-                rowId = Convert.toInt(posArray[1]+posArray[2]) + "";
+                rowId = Convert.toInt(proStr(posArray[1]+posArray[2])) + "";
                 colId = Convert.toInt(posArray[3]) + "";
                 colId = Convert.toInt(posArray[3]) + "";
             }
             }
         } catch (Exception ex) {
         } catch (Exception ex) {