入库判定接口修改

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

@@ -73,6 +73,7 @@ public class SungyaApi extends BaseSmfApiListener {
                 if (codeBean.getBarcode() == null) {
                     barcode = new Barcode();
                     barcode.setBarcode(codeBean.getCodeStr());
+                    //barcode.setFullCode(codeBean.getCodeStr());
                 }
                 barcode.setPlateSize(codeBean.getReelWidth());
                 barcode.setHeight(codeBean.getReelHeight());
@@ -92,8 +93,8 @@ public class SungyaApi extends BaseSmfApiListener {
                 if ("1".equals(sungyaResult.getStatus())) {
                     Item item = sungyaResult.getItem();
                     //物料编号
-                    if (StringUtils.isNotBlank(item.getPartNum())) {
-                        barcode.setPartNumber(item.getPartNum());
+                    if (StringUtils.isNotBlank(item.getPartnum())) {
+                        barcode.setPartNumber(item.getPartnum());
                     }
                     //供应商信息
                     if (StringUtils.isNotBlank(item.getVendor())) {
@@ -112,25 +113,27 @@ public class SungyaApi extends BaseSmfApiListener {
                         barcode.setHeight(item.getH());
                     }
                     //生产日期
-                    if (StringUtils.isNotBlank(item.getProduceDate())) {
-                        barcode.setProduceDate(DateUtil.toDate(item.getProduceDate(), "yyyy-MM-dd HH:mm:ss"));
+                    if (StringUtils.isNotBlank(item.getProducedate())) {
+                        barcode.setProduceDate(DateUtil.toDate(item.getProducedate(), "yyyy-MM-dd HH:mm:ss"));
                     }
                     //过期时间
-                    if (StringUtils.isNotBlank(item.getExpireDate())) {
-                        barcode.setExpireDate(DateUtil.toDate(item.getExpireDate(), "yyyy-MM-dd HH:mm:ss"));
+                    if (StringUtils.isNotBlank(item.getExpiredate())) {
+                        barcode.setExpireDate(DateUtil.toDate(item.getExpiredate(), "yyyy-MM-dd HH:mm:ss"));
                     }
                     //批次
                     if (StringUtils.isNotBlank(item.getBatch())) {
                         barcode.setBatch(item.getBatch());
                     }
                     //搅拌时间(锡膏料仓使用)
-                    if (item.getMixTime() != null) {
-                        barcode.setMixTime(item.getMixTime());
+                    if (item.getMixtime() != null) {
+                        barcode.setMixTime(item.getMixtime());
                     }
                     //如果fullcode为空,则取barcode
                     if (StringUtils.isBlank(barcode.getFullCode())){
                         barcode.setFullCode(barcode.getBarcode());
                     }
+                    resolveComponent(barcode);
+                    barcode = barcodeManager.saveBarcode(barcode);
                     return barcode;
                 } else {
                     errorMsg = "Sungya [" + barcode.getBarcode() + "] NG:" + result;
@@ -141,9 +144,11 @@ public class SungyaApi extends BaseSmfApiListener {
             log.error(msg, e);
             throw new ValidateException("sungya.error", msg + ":" + e.getMessage());
         }
-        throw new ValidateException(errorMsg, "Sungya验证失败");
+        throw new ValidateException(errorMsg, "Sungya验证失败"+errorMsg);
     }
 
+
+
     /**
      * 入库判定接口
      *

src/main/java/com/neotel/smfcore/custom/sungya20456/bean/Item.java

@@ -7,7 +7,7 @@ public class Item {
     /**
      * 物料编码
      */
-    private String partNum;
+    private String partnum;
 
     /**
      * 供应商信息
@@ -32,12 +32,12 @@ public class Item {
     /**
      * 生产日期,格式为yyyy-MM-dd HH:mm:ss
      */
-    private String produceDate;
+    private String producedate;
 
     /**
      * 过期时间,格式为 yyyy-MM-dd HH:mm:ss
      */
-    private String expireDate;
+    private String expiredate;
 
     /**
      * 批次信息
@@ -47,5 +47,5 @@ public class Item {
     /**
      * 搅拌时间(锡膏料仓使用)
      */
-    private Integer mixTime;
+    private Integer mixtime;
 }