Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/solder/rest/SpBoxController.java

@@ -173,7 +173,7 @@ public class SpBoxController {
                 }
                 }
             }
             }
 
 
-            log.info("outSolder 锡膏定时出库，storageId=" + storageId + "，共需要出" + num + ",查找到F库位=" + fNum + ",B库位=" + bNum);
+            log.info("outSolder 锡膏定时出库，storageId=" + storageId + "，pn="+pn+"，共需要出" + num + ",查找到F库位=" + fNum + ",B库位=" + bNum);
             setOutDate(solderPosList, outDate);
             setOutDate(solderPosList, outDate);
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");

src/main/java/com/neotel/smfcore/custom/sp/SpApi.java

@@ -29,6 +29,11 @@ import java.util.*;
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class SpApi extends BaseSmfApiListener {
 public class SpApi extends BaseSmfApiListener {
+//api:
+//  name: sp
+//  codeResolveUrl: http://172.30.11.214:8036/SmartRefrigerator/warehousing
+//  inNotifyUrl: http://172.30.11.214:8036/SmartRefrigerator/warehousingStatus
+//  outNotifyUrl: http://172.30.11.214:8036/SmartRefrigerator/exitWarehouseStatus
     @Autowired
     @Autowired
     IBarcodeManager barcodeManager;
     IBarcodeManager barcodeManager;
 
 
@@ -109,9 +114,25 @@ public class SpApi extends BaseSmfApiListener {
             }
             }
             String produceDateStr = getData(dataMap, "produceDate");
             String produceDateStr = getData(dataMap, "produceDate");
             if (Strings.isNotBlank(produceDateStr)) {
             if (Strings.isNotBlank(produceDateStr)) {
-                Date produceDate = DateUtil.toDate(produceDateStr, "yyyy-MM-dd HH:mm:ss");
+                Date produceDate = null;
+
+                try {
+                    produceDate = DateUtil.toDate(produceDateStr, "yyyy-MM-dd HH:mm:ss");
+                } catch (Exception ex) {
+                    log.error("生成日期["+produceDateStr+"]转换出错:"+ex.toString());
+                }
+                if (produceDate == null) {
+                    try {
+                        produceDate = DateUtil.toDate(produceDateStr, "yyyyMMdd");
+                    } catch (Exception ex) {
+                        log.error("生成日期["+produceDateStr+"]转换出错:"+ex.toString());
+                    }
+                }
+                if (produceDate != null) {
+                    log.info("保存生成日期：["+produceDate.toString()+"]");
                     barcode.setProduceDate(produceDate);
                     barcode.setProduceDate(produceDate);
                 }
                 }
+            }
 
 
             String expireDateStr = getData(dataMap, "expireDate");
             String expireDateStr = getData(dataMap, "expireDate");
             if (Strings.isNotBlank(expireDateStr)) {
             if (Strings.isNotBlank(expireDateStr)) {