Merge remote-tracking branch 'origin/fencang' into fencang

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.controller.basic;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.sql.Order;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.dao.basic.UdiInfoDao;
@@ -21,6 +22,7 @@ import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.sale.admin.req.thrsys.*;
+import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse;
 import com.glxp.sale.admin.res.basic.SpSyncUdiResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
@@ -44,6 +46,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SpsSyncDownloadService {
@@ -297,6 +300,10 @@ public class SpsSyncDownloadService {
     OrderService orderService;
     @Resource
     CodesService codesService;
+    @Resource
+    StockOrderDetailService stockOrderDetailService;
+    @Resource
+    StockOrderService stockOrderService;
 
 
     public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) {
@@ -379,23 +386,48 @@ public class SpsSyncDownloadService {
                 }
             }
 
-
+            List<StockOrderRemakEntity> stockOrderRemakEntities = new ArrayList<>();
-            List<ErpOrderEntity> allOrderDetailEntityList = new ArrayList<>();
             List<WarehouseEntity> warehouseEntityList = new ArrayList<>();
             if (CollUtil.isNotEmpty(orderEntities)) {
                 for (OrderEntity orderEntity : orderEntities) {
-//                    List<ErpOrderEntity> orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId());
-//                    if (CollUtil.isNotEmpty(orderDetailEntityList)) {
-//                        allOrderDetailEntityList.addAll(orderDetailEntityList);
-//                    }
                     List<WarehouseEntity> codes = codesService.findByReceiptId(orderEntity.getId());
                     if (CollUtil.isNotEmpty(codes)) {
                         warehouseEntityList.addAll(codes);
                     }
+                    String erpId = orderEntity.getErpFk();
+                    List<String> erpIdArray = new ArrayList<>();
+                    if (StrUtil.isNotEmpty(erpId)) {
+                        if (erpId.contains(",")) {
+                            String[] erpIDs = erpId.split(",");
+                            for (int i = 0; i < erpIDs.length; i++) {
+                                erpIdArray.add(erpIDs[i]);
+                            }
+                        } else {
+                            erpIdArray.add(erpId);
+                        }
+
+                    }
+                    List<StockOrderDetailEntity> stockOrderDetailArray = new ArrayList<>();
+                    for (String erpNo : erpIdArray) {
+                        StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(erpNo);
+                        if (stockOrderEntity != null) {
+                            List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailService.findByOrderIdFk(stockOrderEntity.getId());
+                            stockOrderDetailArray.addAll(stockOrderDetailEntities);
+                        }
+
+
+                    }
+                    List<StockOrderRemakEntity> remakEntityList = stockOrderDetailArray.stream().map(e -> {
+                        StockOrderRemakEntity stockOrderRemakEntity = new StockOrderRemakEntity();
+                        BeanUtils.copyProperties(e, stockOrderRemakEntity);
+                        stockOrderRemakEntity.setOrderIdFk(orderEntity.getId());
+                        return stockOrderRemakEntity;
+                    }).collect(Collectors.toList());
+                    stockOrderRemakEntities.addAll(remakEntityList);
                 }
             }
+            syncOrderResponse.setStockOrderRemakEntities(stockOrderRemakEntities);
             syncOrderResponse.setOrderEntities(orderEntities);
-            syncOrderResponse.setOrderDetailEntityList(allOrderDetailEntityList);
             syncOrderResponse.setWarehouseEntityList(warehouseEntityList);
         }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -482,7 +482,6 @@ public class WareHouseController {
                 }
             }
             BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
-            baseResponse.setData(originCode);
             return baseResponse;
         }
 

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

@@ -0,0 +1,17 @@
+package com.glxp.sale.admin.dao.inout;
+
+import com.glxp.sale.admin.entity.inout.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/sale/admin/entity/inout/StockOrderRemakEntity.java

@@ -0,0 +1,21 @@
+package com.glxp.sale.admin.entity.inout;
+
+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/sale/admin/res/basic/SpsSyncOrderResponse.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.res.basic;
 
 import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
+import com.glxp.sale.admin.entity.inout.StockOrderRemakEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import lombok.Data;
 
@@ -15,4 +16,6 @@ public class SpsSyncOrderResponse {
     List<OrderEntity> orderEntities;
     List<ErpOrderEntity> orderDetailEntityList;
     List<WarehouseEntity> warehouseEntityList;
+
+    List<StockOrderRemakEntity> stockOrderRemakEntities;
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inout/StockOrderDetailService.java

@@ -9,6 +9,9 @@ import java.util.List;
 
 public interface StockOrderDetailService {
 
+
+    List<StockOrderDetailEntity> findByOrderIdFk(String orderFk);
+
     List<StockOrderDetailEntity> filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);
 
     List<StockOrderDetailResponse> filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderDetailServiceImpl.java

@@ -23,6 +23,17 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
     @Resource
     private SystemParamConfigDao systemParamConfigDao;
 
+    @Override
+    public List<StockOrderDetailEntity> findByOrderIdFk(String orderFk) {
+        if (StrUtil.isEmpty(orderFk)) {
+            return null;
+        } else {
+            StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
+            stockOrderDetailFilterRequest.setOrderIdFk(orderFk);
+            return stockOrderDetailDao.filterStockOrderDetail(stockOrderDetailFilterRequest);
+        }
+    }
+
     @Override
     public List<StockOrderDetailEntity> filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) {
         if (stockOrderDetailFilterRequest == null) {

api-admin/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.password=123456

api-admin/src/main/resources/mybatis/mapper/inout/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.sale.admin.dao.inout.StockOrderRemakDao">
+
+    <select id="findByOrderIdFk" parameterType="Map"
+            resultType="com.glxp.sale.admin.entity.inout.StockOrderRemakEntity">
+        select stock_order_remak.*
+        from stock_order_remak
+        WHERE orderIdFk = #{id}
+    </select>
+
+
+    <insert id="insertOrderRemaks" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inout.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},#{remark}
+            )
+        </foreach>
+
+    </insert>
+
+    <delete id="deleteByOrderIdFk" parameterType="Map">
+        DELETE
+        FROM stock_order_remak
+        WHERE orderIdFk = #{id}
+    </delete>
+
+
+</mapper>