新增单据同步时同时同步业务单据详情信息

api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java

@@ -0,0 +1,17 @@
+package com.glxp.api.admin.dao.business;
+
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface StockOrderRemakDao {
+
+    List<StockOrderRemakEntity> findByOrderIdFk(@Param("id") String id);
+
+    boolean insertOrderRemaks(@Param("orderRemakEntities") List<StockOrderRemakEntity> OrderRemakEntitys);
+
+    boolean deleteByOrderIdFk(@Param("id") String id);
+}

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java

@@ -0,0 +1,21 @@
+package com.glxp.api.admin.entity.business;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class StockOrderRemakEntity {
+    private Integer id;
+    private String orderIdFk;
+    private String relId;
+    private String batchNo;
+    private BigDecimal price;
+    private String secSalesListNo;
+    private String firstSalesInvNo;
+    private String secSalesInvNo;
+    private String invoiceDate;
+    private String remark;
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java

@@ -92,6 +92,7 @@ public class SpGetHttpClient {
     public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
         Map<String, String> paramMap = new HashMap<>(16);
         paramMap.put("type", type);
+        paramMap.put("status", "3");
         String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
         try {
             BaseResponse<List<BasicExportStatusEntity>> data =
@@ -149,7 +150,6 @@ public class SpGetHttpClient {
         basicExportStatusRequest.setType(type);
         String json = JSONUtil.toJsonStr(basicExportStatusRequest);
         String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json);
-//        String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest);
         return result;
     }
 

api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.res.basic;
 
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.inout.ErpOrderEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
@@ -15,4 +16,8 @@ public class SpsSyncOrderResponse {
     List<OrderEntity> orderEntities;
     List<ErpOrderEntity> orderDetailEntityList;
     List<WarehouseEntity> warehouseEntityList;
+
+
+    List<StockOrderRemakEntity> stockOrderRemakEntities;
+
 }

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.dao.auth.AuthAdminDao;
 import com.glxp.api.admin.dao.basic.*;
+import com.glxp.api.admin.dao.business.StockOrderRemakDao;
 import com.glxp.api.admin.dao.inout.CodesTempDao;
 import com.glxp.api.admin.dao.inout.OrderDao;
 import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao;
@@ -17,6 +18,7 @@ import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao;
 import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.basic.*;
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
@@ -94,7 +96,9 @@ public class DlBasicService {
     @Resource
     private BussinessTypeService bussinessTypeService;
     @Resource
-    private SystemParamConfigService systemParamConfigService;
+    private StockOrderRemakDao stockOrderRemakDao;
+
+
     private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
 
 //------------------------------------------------------------
@@ -213,6 +217,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("往来单位：").append(syncDataResponse.getBasicUnitMaintainEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -227,6 +232,7 @@ public class DlBasicService {
                                 }
                                 batchSession.commit();
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -244,6 +250,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方产品信息：").append(syncDataResponse.getThrProductsEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -260,6 +267,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方往来单位信息：").append(syncDataResponse.getThrCorpEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -275,6 +283,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方业务单据：").append(syncDataResponse.getThrOrderEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -289,6 +298,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方业务单据详情：").append(syncDataResponse.getThrOrderDetailEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -508,7 +518,10 @@ public class DlBasicService {
 
                                 }
                                 batchSession.commit();
-
+                                if (CollUtil.isNotEmpty(syncDataResponse.getStockOrderRemakEntities())) {
+                                    List<StockOrderRemakEntity> stockOrderRemakEntities = syncDataResponse.getStockOrderRemakEntities();
+                                    stockOrderRemakDao.insertOrderRemaks(stockOrderRemakEntities);
+                                }
                                 String logs = "";
                                 if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities()))
                                     logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n";
@@ -518,6 +531,7 @@ public class DlBasicService {
                                     logs = logs + "单据条码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n";
                                 remark.append(logs);
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
                         batchSession.close();

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -10,9 +10,11 @@ import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils;
 import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
 import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.api.admin.controller.inout.utils.InoutUtils;
+import com.glxp.api.admin.dao.business.StockOrderRemakDao;
 import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inout.ErpOrderEntity;
@@ -77,14 +79,10 @@ public class IoTransInoutService {
     @Resource
     private OrderDetailService myErpOrderService;
 
-    @Resource
-    BussinessLocalTypeService bussinessLocalTypeService;
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
     private UdiInfoService udiInfoService;
-    @Value("${UDI_SERVER_URL}")
-    private String udiUrl;
 
     @Resource
     private CodesTempService codesTempService;
@@ -101,17 +99,15 @@ public class IoTransInoutService {
     @Resource
     CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
-    CompanyService companyService;
-    @Resource
     InvWarehouseService invWarehouseService;
     @Resource
     InvProductService invProductService;
     @Resource
     InvPreProductService invPreProductService;
     @Resource
-    UdiDlHttpClient udiDlHttpClient;
-    @Resource
     GennerOrderUtils gennerOrderUtils;
+    @Resource
+    StockOrderRemakDao stockOrderRemakDao;
 
     @Async
     public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) {
@@ -823,7 +819,6 @@ public class IoTransInoutService {
                     stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo());
                     stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate());
                     stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate());
-//                    stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get());
                     if (erpOrderEntity.getCount() != null) {
                         stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount());
                         stockOrderDetailEntity.setReCount(erpOrderEntity.getCount());
@@ -838,6 +833,25 @@ public class IoTransInoutService {
                         stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount());
                     }
 
+                    if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
+
+                        List<StockOrderRemakEntity> stockOrderRemakEntities = stockOrderRemakDao.findByOrderIdFk(orderId);
+
+                        for (StockOrderRemakEntity stockOrderRemakEntity : stockOrderRemakEntities) {
+                            if (StrUtil.trimToEmpty(stockOrderRemakEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
+                                    &&
+                                    StrUtil.trimToEmpty(stockOrderRemakEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
+                            ) {
+                                stockOrderDetailEntity.setPrice(stockOrderRemakEntity.getPrice());
+                                stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo());
+                                stockOrderDetailEntity.setFirstSalesInvNo(stockOrderRemakEntity.getFirstSalesInvNo());
+                                stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo());
+                                stockOrderDetailEntity.setInvoiceDate(stockOrderRemakEntity.getInvoiceDate());
+                            }
+                        }
+                    }
+
+
                     stockOrderDetailEntities.add(stockOrderDetailEntity);
                 }
                 if (!isError) {

api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java

@@ -97,7 +97,7 @@ public class OkHttpCli {
             }
 
         }
-
+        log.info(sb.toString());
         Request request = builder.url(sb.toString()).build();
         log.info("do get request and url[{}]", sb.toString());
         return execute(request);

api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.business.StockOrderRemakDao">
+
+    <select id="findByOrderIdFk" parameterType="Map"
+            resultType="com.glxp.api.admin.entity.business.StockOrderRemakEntity">
+        select stock_order_remak.*
+        from stock_order_remak
+        WHERE orderIdFk = #{id}
+    </select>
+
+
+    <insert id="insertOrderRemaks" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.business.StockOrderRemakEntity">
+        insert INTO stock_order_remak(
+        orderIdFk,batchNo,price,relId
+        ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark)
+        values
+        <foreach collection="orderRemakEntities" item="item" index="index"
+                 separator=",">
+            (
+            #{item.orderIdFk},
+            #{item.batchNo},
+            #{item.price},#{item.relId},#{item.firstSalesInvNo},#{item.secSalesInvNo},
+            #{item.secSalesListNo},#{item.invoiceDate},#{item.remark}
+            )
+        </foreach>
+
+    </insert>
+
+    <delete id="deleteByOrderIdFk" parameterType="Map">
+        DELETE
+        FROM stock_order_remak
+        WHERE orderIdFk = #{id}
+    </delete>
+
+
+</mapper>