Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/custom/sungya20456/SungyaApi.java

@@ -127,6 +127,10 @@ public class SungyaApi extends BaseSmfApiListener {
                     if (item.getMixTime() != null) {
                         barcode.setMixTime(item.getMixTime());
                     }
+                    //如果fullcode为空,则取barcode
+                    if (StringUtils.isBlank(barcode.getFullCode())){
+                        barcode.setFullCode(barcode.getBarcode());
+                    }
                     return barcode;
                 } else {
                     errorMsg = "Sungya [" + barcode.getBarcode() + "] NG:" + result;
@@ -230,11 +234,7 @@ public class SungyaApi extends BaseSmfApiListener {
                 bodyMap.put("reelId", task.getBarcode());
                 bodyMap.put("location", task.getPosName());
                 bodyMap.put("source", "SMF");
-                bodyMap.put("fullCode", "");
-                Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
-                if (barcode != null) {
-                    bodyMap.put("fullCode", barcode.getFullCode());
-                }
+                bodyMap.put("fullCode", task.getBarcode());
                 paramMap.put("body", bodyMap);
                 String requestParams = JsonUtil.toJsonStr(paramMap);
                 log.info(task.getBarcode() + "入库通知,参数" + requestParams);