1.修复先进先出规则

tzsk

昨天 3df9a5570891321c390ef423fafd1dcacb1930b1

1.修复先进先出规则

 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java

@@ -62,7 +62,7 @@

    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
        //根据物料号和批次找到对应的库存，并且按照修改时间排序
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("appe_time");

        wapperSetCondition(wrapper,"batch",batch);
        wapperSetCondition(wrapper,"three_code",csocode);

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -108,7 +108,7 @@

    //出库
    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("modi_time");
        Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq("matnr", matnr).orderBy("appetime");
        wapperSetCondition(wrapper,"batch",batch);
        wapperSetCondition(wrapper,"three_code",csocode);
        wapperSetCondition(wrapper,"dead_time",isoseq);

 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java

@@ -276,7 +276,7 @@
    }

    public double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq) {
        Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("matnr", matnr).orderBy("modi_time");
        Wrapper<ManLocDetl> wrapper = new EntityWrapper<ManLocDetl>().eq("matnr", matnr).orderBy("appe_time");
        wrapper.eq("status",1);
        wapperSetCondition(wrapper,"batch",batch);
        wapperSetCondition(wrapper,"csocode",csocode);

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -552,7 +552,7 @@
                wrkDetl.setOrderNo(locDto.getOrderNo());
                wrkDetl.setAnfme(locDto.getAnfme()); // 作业数量
                wrkDetl.setStock(locDto.getStock());//总库存
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeTime(locMast.getAppeTime());
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
                wrkDetl.setModiUser(userId);
@@ -576,7 +576,7 @@
                    wrkDetl.setOrderNo(orderDto.getOrderNo());
                    wrkDetl.setAnfme(orderDto.getAnfme()); // 数量
                    wrkDetl.setStock(locDto.getStock());//总库存
                    wrkDetl.setAppeTime(now);
                    wrkDetl.setAppeTime(locMast.getAppeTime());
                    wrkDetl.setAppeUser(userId);
                    wrkDetl.setModiTime(now);
                    wrkDetl.setModiUser(userId);

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -213,7 +213,7 @@
                        locDetl.setDeadTime(detlDto.getIsoseq());
                        locDetl.setProddate(detlDto.getProddate());
                        locDetl.setDeadline(detlDto.getDeadline());
                        locDetl.setAppeTime(now);
                        locDetl.setAppeTime(wrkDetl.get(0).getAppeTime());
                        locDetl.setAppeUser(9527L);
                        locDetl.setModiTime(now);
                        locDetl.setModiUser(9527L);

 src/main/webapp/views/mat/mat.html

@@ -132,7 +132,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>
        <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-normal btn-add" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <!-- 商品/物料 数据中心 -->
        <div class="dropdown-menu" style="float: right">