需求

zc

2024-07-25 09b04dd475fffad1d38cecf946cd09b6698b0938

需求

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -111,6 +111,8 @@
//                param.remove("row");
//            }
//        }
        Object query_date = param.get("query_date");
        param.remove("query_date");
        excludeTrash(param);
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
@@ -119,6 +121,12 @@
//            wrapper.and()
//                    .where("loc_no like '" +row +"%'");
//        }
        if (query_date!=null){
            if (query_date.toString().contains(" - ")) {
                String[] dates = query_date.toString().split(" - ");
                wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
            }
        }
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/entity/StockStatisDTO.java

@@ -13,4 +13,8 @@
    private int erpQty;
    private String itemBatch;
    private String specs;

    private String   pgNo;
    private String   outOrderNo;
    private String   batch;
}

 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -155,6 +155,10 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    private String outOrderNo;

    private String sPgNO;

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modi_user);

 src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java

@@ -29,7 +29,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void InCancelScheduler() {
        log.info("InCancelScheduler开始了");
        //log.info("InCancelScheduler开始了");
        if (!erpEnabled) return;
        String sqlInCancelTB = "select * from erp_InCancelTB where LKName='中扬二期'";
        List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);

 src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java

@@ -36,7 +36,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void InHedTBScheduler() {
        log.info("InHedTBScheduler开始了");
        //log.info("InHedTBScheduler开始了");
        if (!erpEnabled) return;
        String sqlInHed = "select * from erp_InHedTB where LKName='中扬二期'";
        List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);

 src/main/java/com/zy/third/erp/task/ERPItemScheduler.java

@@ -31,7 +31,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void ItemScheduler() {
        log.info("ItemScheduler开始了");
        //log.info("ItemScheduler开始了");
        if (!erpEnabled) return;
        String sqlItemTB = "select * from erp_ItemTB where LKName='中扬二期'";
        List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);

 src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java

@@ -30,7 +30,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void InCancelScheduler() {
        log.info("InCancelScheduler开始了");
        //log.info("InCancelScheduler开始了");
        if (!erpEnabled) return;
        String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='中扬二期'";
        List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);

 src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java

@@ -36,7 +36,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void OutHedTBScheduler() {
        log.info("OutHedTBScheduler开始了");
        //log.info("OutHedTBScheduler开始了");
        if (!erpEnabled) return;
        String sqlInHed = "select * from erp_OutHedTB where LKName='中扬二期'";
        List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);

 src/main/java/com/zy/third/lk/task/LKInTBScheduler.java

@@ -47,7 +47,7 @@
    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    public void pakinOrderComplete() {
        log.info("开始入库更新完成回报");
        //log.info("开始入库更新完成回报");
        // 所有订单
        List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
        DocType docType;

 src/main/resources/application.yml

@@ -108,6 +108,6 @@
  refreshtime: 0/5 * * * * ?
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK2
    url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK
    username: sa
    password: sa@123

 src/main/resources/mapper/LocDetlMapper.xml

@@ -413,12 +413,42 @@
        <id column="asrsQty" property="lkQty" />
        <id column="erpQty" property="erpQty" />

        <id column="pgNo" property="pgNo" />
        <id column="outOrderNo" property="outOrderNo" />
        <id column="batch" property="batch" />

    </resultMap>

    <select id="asrsAndErpList" resultMap="stockStatisDTO">
        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 == 1 ">
            and asrsQty != erpQty
        </if>
        <if test="different != null and different == 0 ">
            and asrsQty = erpQty
        </if>
        <if test="matnr != null and matnr != ''">
            AND matnr like #{matnr}
        </if>
        <if test="maktx != null and maktx != ''">
            AND maktx like #{maktx}
        </if>
        <if test="specs != null and specs != ''">
            AND specs like #{specs}
        </if>
        <if test="sPgNO != null">
            AND pgNO like #{sPgNO}
        </if>
        <if test="outOrderNo != null">
            AND outOrderNo like #{outOrderNo}
        </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
        <if test="different != null and different == 1 ">
            and asrsQty != erpQty
        </if>
@@ -434,19 +464,11 @@
        <if test="specs != null">
            AND specs like #{specs}
        </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">
            AND matnr like #{matnr}
        <if test="sPgNO != null">
            AND pgNO like #{sPgNO}
        </if>
        <if test="maktx != null">
            AND maktx like #{maktx}
        </if>
        <if test="specs != null">
            AND specs like #{specs}
        <if test="outOrderNo != null">
            AND outOrderNo like #{outOrderNo}
        </if>
    </select>
</mapper>

 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -48,6 +48,12 @@
        <if test="specs != null and specs != ''">
            and specs like concat('%',#{specs},'%')
        </if>
    <if test="outOrderNo != null and outOrderNo != ''">
        and out_order_no like concat('%',#{outOrderNo},'%')
    </if>
    <if test="sPgNO != null and sPgNO != ''">
        and pg_no like concat('%',#{sPgNO},'%')
    </if>
</sql>

<sql id="viewWorkOutConditionSql">

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -454,7 +454,11 @@
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    layDate.render({
        elem: '.layui-laydate-range'
        ,type: 'datetime'
        ,range: true
    });
    // 时间选择器
    layDate.render({
        elem: '#modiTime\\$',

 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js

@@ -34,7 +34,10 @@
            {field: 'erpQty', title:'ERP数量', align: 'center', width:150},
            {field: 'matnr', title:'产品编码', align: 'center'},
            {field: 'specs', title:'产品规格', align: 'center'},
            {field: 'maktx', title:'产品名称', align: 'center'}
            {field: 'maktx', title:'产品名称', align: 'center'},
            {field: 'sPgNO', title:'派工单号', align: 'center'},
            {field: 'outOrderNo', title:'订单号', align: 'center'},
            {field: 'batch', title:'批次', align: 'center'}
        ]],
        request: {
            pageName: 'curr',

 src/main/webapp/views/locDetl/locDetl.html

@@ -34,6 +34,21 @@
            <input class="layui-input" type="text" name="specs" placeholder="规格" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="pg_no" placeholder="派工单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="out_order_no" placeholder="成品订单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="入库起始时间 - 入库终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="row" placeholder="排数" autocomplete="off">-->

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

@@ -32,6 +32,21 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="sPgNO" placeholder="派工单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="outOrderNo" placeholder="成品订单号" autocomplete="off">
        </div>
    </div>
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="zpallet" placeholder="托盘条码" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input name="different" type="radio" value="0" title="显示全部" checked>
            <input name="different" type="radio" value="1" title="显示差异">


 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -92,6 +92,22 @@
                <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            </div>
        </div>

        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="sPgNO" placeholder="派工单号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="outOrderNo" placeholder="成品订单号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="zpallet" placeholder="托盘条码" autocomplete="off">
            </div>
        </div>
        <!-- 待添加 -->
        <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>

 src/main/webapp/views/report/viewWorkIn.html

@@ -54,6 +54,16 @@
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="入库起始时间 - 入库终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="sPgNO" placeholder="派工单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="outOrderNo" placeholder="成品订单号" autocomplete="off">
        </div>
    </div>
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>

 src/main/webapp/views/report/viewWorkOut.html

@@ -54,6 +54,16 @@
            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="sPgNO" placeholder="派工单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="outOrderNo" placeholder="成品订单号" autocomplete="off">
        </div>
    </div>
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>

 src/main/webapp/views/waitPakin/waitPakin_detail.html

@@ -64,7 +64,7 @@
            <div class="layui-input-inline">
                <input id="status" class="layui-input" type="text">
            </div>
        </div>
        </div>aitPakin/list
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">