修改拉取状态信息

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -458,7 +458,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
     public String pullFromOms() {
         try {
             Map<String, Object> condition = new HashMap<>();
-            condition.put("status", Dict.productRecordStatus.item_02.getItem() + "," + Dict.productRecordStatus.item_12.getItem());
+            condition.put("status", Dict.productRecordStatus.item_21.getItem());
             List<GoodsProductEntity> goodsProductEntityList = goodsProductDao.queryList(condition);
             if (goodsProductEntityList == null || goodsProductEntityList.size() == 0) {
                 return "没有要发送的数据";
@@ -492,17 +492,17 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 String bondedCode = treeMap.get("bondedCode").toString();   //海关商品编码
                 String localEmsNo = treeMap.get("localEmsNo").toString();   //园区账册编号
                 String itemRecordNo = treeMap.get("itemRecordNo").toString();   //园区商品序号
-                String remark = null ;
+               /* String remark = null ;
                 if (treeMap.get("remark") != null) {
                     remark = treeMap.get("remark").toString();   //备注
-                }
+                }*/
                 String legalUnit1Qty = treeMap.get("legalUnit1Qty").toString(); //法1
                 String legalUnit2Qty = treeMap.get("legalUnit2Qty").toString(); //法2
                 String cusDeclEle = treeMap.get("cusDeclEle").toString();   //申报要素
-                String modTime = null ;
+               /* String modTime = null ;
                 if (treeMap.get("modTime")!=null) {
                     modTime = treeMap.get("modTime").toString();
-                }
+                }*/
                 for (GoodsProductEntity goodsProductEntity : goodsProductEntityList) {
                     if (merchSn1.equals(goodsProductEntity.getMerchSn()) && sku.equals(goodsProductEntity.getSku()) && prodBarcode.equals(goodsProductEntity.getProdBarcode())) {
                         goodsProductEntity.setGrossWeight(new BigDecimal(grossWeight));
@@ -511,14 +511,14 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                         goodsProductEntity.setLegalUnit2Qty(new BigDecimal(legalUnit2Qty));
                         goodsProductEntity.setCiqMainEle(ciqMainEle);
                         goodsProductEntity.setCusDeclEle(cusDeclEle);
-                        goodsProductEntity.setOmsAuditRemark(remark);
+//                        goodsProductEntity.setOmsAuditRemark(remark);
                         goodsProductEntity.setItemRecordNo(itemRecordNo);
                         goodsProductEntity.setLocalEmsNo(localEmsNo);
                         goodsProductEntity.setProdBrand(prodBrand);
-                        if (modTime!=null) {
-                            goodsProductEntity.setOmsAuditTime(DateUtils.strToDate(modTime));
-                        }
-                        goodsProductEntity.setOmsAuditStatus("2");
+//                        if (modTime!=null) {
+//                            goodsProductEntity.setOmsAuditTime(DateUtils.strToDate(modTime));
+//                        }
+//                        goodsProductEntity.setOmsAuditStatus("2");
                         goodsProductEntity.setModTime(new Date());
                         goodsProductEntity.setModerSn(ShiroUtils.getUserId().toString());
                         goodsProductEntity.setStatus(Dict.productRecordStatus.item_22.getItem());

kmall-admin/src/main/java/com/kmall/admin/service/impl/oms2kmall/Oms2KmallServiceImpl.java

@@ -104,6 +104,7 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
             resp.setAuditRemark(resp.getAuditRemark() + "，请重新拉取最新备案信息。");
         } else if ("2".equals(resp.getIsAudit())) {
             resp.setIsAudit(Dict.omsAuditStatus.item_3.getItem());
+            resp.setAuditRemark(resp.getAuditRemark() + "，备案信息失败。");
         }
         GoodsProductEntity entity = goodsProductService.queryBySku(resp.getSku());
         if (entity == null) {

kmall-admin/src/main/resources/mybatis/mapper/GoodsProductDao.xml

@@ -837,7 +837,7 @@
                 <if test="map.omsAuditStatus == 3">
                     case status
                     when '02' then '03'
-                    when '12' then '23'
+                    when '12' then '13'
                     else '88' end
                 </if>
                 ,