啊鑫
2025-05-27 fe0653b458fbcac5a07c62e328a95c76d2b88e0e
添加srm与U9订单数据的对比
已修改6个文件
22225 ■■■■ 文件已修改
logs/xky_service.log 22199 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gs/xky/mapper/PurchaseOrderCompareMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gs/xky/mapper/PurchaseOrderDetailMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gs/xky/service/PurchaseService.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PurchaseOrderCompareMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PurchaseOrderDetailMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
logs/xky_service.log
ÎļþÌ«´ó
src/main/java/com/gs/xky/mapper/PurchaseOrderCompareMapper.java
@@ -11,4 +11,5 @@
 */
public interface PurchaseOrderCompareMapper extends BaseMapper<PurchaseOrderCompare> {
    int deleteByPrimaryKey();
}
src/main/java/com/gs/xky/mapper/PurchaseOrderDetailMapper.java
@@ -7,4 +7,6 @@
 * é‡‡è´­è®¢å•明细表Mapper接口
 */
public interface PurchaseOrderDetailMapper extends BaseMapper<PurchaseOrderDetail> {
    int deleteByPrimaryKey();
src/main/java/com/gs/xky/service/PurchaseService.java
@@ -10,6 +10,7 @@
import com.gs.xky.entity.PurchaseOrderCompare;
import com.gs.xky.entity.PurchaseOrderDetail;
import com.gs.xky.mapper.PurchaseOrderCompareMapper;
import com.gs.xky.mapper.PurchaseOrderDetailMapper;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,6 +31,7 @@
    private final MesRohInDataService mesRohInDataService;
    private final PurchaseOrderDetailService purchaseOrderDetailService;
    private final PurchaseOrderCompareMapper purchaseOrderCompareMapper;
    private final PurchaseOrderDetailMapper purchaseOrderDetailMapper;
    /**
     * åŒæ­¥é‡‡è´­è®¢å•明细数据
@@ -44,6 +46,10 @@
        long currentTimeMillis = System.currentTimeMillis();
        // é™åˆ¶è¯·æ±‚时间范围为24小时
        long startDate = currentTimeMillis - (24 * 60 * 60 * 1000L);
        // å…ˆåˆ é™¤å·²æœ‰æ•°æ®ï¼Œé¿å…é‡å¤
        purchaseOrderDetailMapper.deleteByPrimaryKey();
        purchaseOrderCompareMapper.deleteByPrimaryKey();
        XkyCommonParam<PurchaseParam> param = XkyCommonParam.GetInit();
        PurchaseParam bodyParam = new PurchaseParam();
@@ -166,13 +172,14 @@
        // è®¡ç®—SRM待收数量
        Integer srmPurchaseQty = detail.getTotalAnswerQty();
        Integer srmReceivedQty = detail.getTotalReceiveQty();
        Integer srmReceivedQty = detail.getPoWaitDeliveryQty() + detail.getReturnWaitDeliveryQty();
        //poWaitDeliveryQty + returnWaitDeliveryQty
        Integer srmWaitReceiveQty = srmPurchaseQty - srmReceivedQty;
        // è®¾ç½®SRM数据
        compareData.setSrmPurchaseQty(srmPurchaseQty);
        compareData.setSrmReceivedQty(srmReceivedQty);
        compareData.setSrmWaitReceiveQty(srmWaitReceiveQty);
        compareData.setSrmReceivedQty(srmWaitReceiveQty);
        compareData.setSrmWaitReceiveQty(srmReceivedQty);
        // è®¾ç½®ERP数据和差异
        if (erpData == null) {
src/main/resources/mapper/PurchaseOrderCompareMapper.xml
@@ -5,4 +5,9 @@
<mapper namespace="com.gs.xky.mapper.PurchaseOrderCompareMapper">
    <delete id="deleteByPrimaryKey">
        delete
        from PURCHASE_ORDER_COMPARE
        where 1 = 1
    </delete>
</mapper>
src/main/resources/mapper/PurchaseOrderDetailMapper.xml
@@ -4,4 +4,9 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gs.xky.mapper.PurchaseOrderDetailMapper">
    <delete id="deleteByPrimaryKey">
        delete
        from PURCHASE_ORDER_DETAIL
        where 1 = 1
    </delete>
</mapper>