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

zhangchao

2024-07-23 2fdec15f591023de2af6b381bb323f8d3b144b7b

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

 src/main/java/asr_show_diff.sql

New file
@@ -0,0 +1,44 @@
SELECT SUM
       ( asrsQty ) asrsQty,
       SUM ( erpQty ) erpQty,
       matnr,
       specs,
       maktx
FROM
    (
        SELECT CAST
               ( SUM ( qty ) AS INT ) asrsQty,
               0 AS erpQty,
               matnr,
               specs,
               maktx
        FROM
            asr_loc_detl
        GROUP BY
            matnr,
            specs,
            maktx UNION ALL
        SELECT
            0,
            CAST ( SUM ( numis ) AS INT ),
            itemid,
            itemcode,
            itemname
        FROM
            (
                SELECT
                    *
                FROM
                    OPENROWSET ( 'SQLOLEDB', '192.168.1.147,1800'; 'XGMLK'; 'xunda0413', XDLinkLK.dbo.vwErpLKStorage )
        WHERE
            LKName = '中扬' 
        ) a 
    GROUP BY
        itemid,
        itemcode,
        itemname 
    ) b WHERE 1=1 and matnr not in (select matnr from man_order_detl)
GROUP BY
    matnr,
    specs,
    maktx

 src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: mac
    active: win

 src/main/resources/mapper/LocDetlMapper.xml

@@ -419,8 +419,11 @@
        SELECT * FROM(
        SELECT ROW_NUMBER ( ) OVER ( ORDER BY d.matnr ) AS row, * FROM (
        SELECT * FROM asr_show_diff WHERE 1 = 1
        <if test="different != null and different ">
            and asrsQty = erpQty
        <if test="different != null and different == 1 ">
            and asrsQty != erpQty
        </if>
        <if test="different != null and different == 0 ">
            and asrsQty == erpQty
        </if>
        <if test="matnr != null">
            AND matnr like #{matnr}
@@ -433,6 +436,7 @@
        </if>
        ) d ) e WHERE  1=1  and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
    </select>

    <select id="asrsAndErpCount" resultType="java.lang.Long">
        SELECT count(*) FROM asr_show_diff WHERE 1 = 1 and asrsQty != erpQty
        <if test="matnr != null">

 src/main/webapp/views/locDetlStatis/locDetlStatis.html

@@ -32,7 +32,9 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input name="different" type="checkbox" lay-skin="switch" value="true" lay-text="显示差异|显示全部" lay-filter="different" >
            <input name="different" type="radio" value="0" title="显示全部" checked>
            <input name="different" type="radio" value="1" title="显示差异">

        </div>
    </div>
    <!-- 待添加 -->
@@ -41,7 +43,6 @@
        </button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置
        </button>

    </div>
<!--    <div class="layui-inline">-->
<!--        <fieldset class="layui-elem-field">-->