保存UAS传来的替代料

src/main/java/com/uas/platform/b2c/external/erp/product/util/ModelConverter.java

@@ -562,10 +562,8 @@ public class ModelConverter {
         productReplace.setErpId(replace.getBPR_ID());
         //设置替代关系状态
         productReplace.setStatus(replace.getBPR_STATUSCODE());
-        //设置下载状态
-        productReplace.setDownStatus(replace.getBPR_SENDSTATUS());
         //设置物料号
-        productReplace.setProductId(Long.parseLong(replace.getBPR_PRODCODE()));
+        productReplace.setProductId(replace.getBPR_PRODCODE());
         //设置替代料号
         productReplace.setReplaceId(replace.getBPR_REPCODE());
         //设置原品牌

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductReplaceDao.java

@@ -35,7 +35,8 @@ public interface ProductReplaceDao extends JpaRepository<ProductReplace, Long>,
      * @param status
      * @return
      */
+    @Transactional
     @Modifying
-    @Query(value = "update ProductReplace set status = :status where erpId = :erpId")
-    ProductReplace update(@Param("erpId") Long erpId,@Param("status")String status);
+    @Query(nativeQuery = true,value = "update product$replace set ptr_status = :status where ptr_erpid = :erpId")
+    void update(@Param("status")String status,@Param("erpId") Long erpId);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductReplace.java

@@ -21,20 +21,20 @@ public class ProductReplace implements Serializable{
     /**
      * erp数据库主键id
      */
-    @Column
+    @Column(name = "ptr_erpid")
     private Long erpId;
 
     /**
      * 替代关系状态
      * ON/OFF
      */
-    @Column
+    @Column(name = "ptr_status")
     private String status;
 
     /**
      * 下载状态
      */
-    @Column
+    @Column(name="ptr_downstatus")
     private String downStatus;
 
 
@@ -48,12 +48,12 @@ public class ProductReplace implements Serializable{
      * 物料id
      */
     @Column(name = "ptr_prid")
-    private Long productId;
+    private String productId;
 
     /***
      * 替代料号
      */
-    @Column
+    @Column(name = "ptr_replaceid")
     private String replaceId;
 
     /**
@@ -155,11 +155,11 @@ public class ProductReplace implements Serializable{
         this.userUU = userUU;
     }
 
-    public Long getProductId() {
+    public String getProductId() {
         return productId;
     }
 
-    public void setProductId(Long productId) {
+    public void setProductId(String productId) {
         this.productId = productId;
     }
 

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductReplaceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.uas.api.b2c_erp.seller.model.ProductReplaceErp;
 import com.uas.api.b2c_erp.seller.service.ProductReplaceService;
 import com.uas.platform.b2c.external.erp.product.util.ModelConverter;
@@ -23,19 +24,19 @@ public class ProductReplaceServiceImpl implements ProductReplaceService {
     /**
      * 更新替代料
      *
-     * @param list
+     * @param jsonStr
      * @return
      */
     @Override
-    public void update(List<ProductReplaceErp> list) {
-
+    public void update(String jsonStr) {
+        List<ProductReplaceErp> list = (List<ProductReplaceErp>)JSONArray.parseArray(jsonStr,ProductReplaceErp.class);
         for(ProductReplaceErp replace : list){
             ProductReplace replace1 = ModelConverter.convert(replace);
             ProductReplace p = dao.findByErpId(replace1.getErpId());
-            if(p != null){
-                dao.save(p);
+            if(p == null){
+                dao.save(replace1);
             }else{
-                dao.update(p.getErpId(),p.getStatus());
+                dao.update(replace1.getStatus(),replace1.getErpId());
             }
         }
     }

src/main/webapp/WEB-INF/spring/webmvc.xml

@@ -116,6 +116,7 @@
 			<mvc:exclude-mapping path="/seek/getSeekPageInfo"/>
 			<mvc:exclude-mapping path="/seek/getSeekRanking"/>
 			<mvc:exclude-mapping path="/seek/release/template"/>
+			<mvc:exclude-mapping path="/erp/productReplace/update"/>
 			<bean class="com.uas.platform.b2c.core.filter.SSOInterceptor"></bean>
 		</mvc:interceptor>
 		<!-- 对所有的请求拦截，将Session中的User信息设置进SystemSession -->