1

zhangc

2025-02-25 4dca5d65e2518f019ce25c805827211e0509598f

1

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

@@ -299,6 +299,40 @@
        return R.ok(page);
    }


    @RequestMapping(value = "/orderDetl/pakout/list/authV8")
    @ManagerAuth
    public R pakoutList8(@RequestParam(defaultValue = "1") Integer curr,
                         @RequestParam(defaultValue = "10") Integer limit,
                         @RequestParam(required = false) String orderByField,
                         @RequestParam(required = false) String orderByType,
                         @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convertLike(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        } else {
            wrapper.orderBy("create_time", false);
        }
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 34) {
                docIds.add(pakin.getDocId());
            }
        }

        wrapper.in("source", docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }

        return R.ok(page);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/authV6")
    @ManagerAuth
    public R pakoutList6(@RequestParam(defaultValue = "1") Integer curr,

 src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java

@@ -35,6 +35,10 @@
    @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1 AND b.floor != 1")
    Double selectSumAnfmeByMatnrProcessed(@Param("matnr") String matnr,@Param("threeCode") String threeCode);

    @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1 AND b.floor = 1")
    Double selectSumAnfmeByMatnrProcessed2(@Param("matnr") String matnr,@Param("threeCode") String threeCode);


    @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
    Double selectSumAnfmeByMatnr2(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);


 src/main/java/com/zy/asrs/service/AgvLocDetlService.java

@@ -29,6 +29,9 @@

    Double getSumAnfmeProcessed(String matnr, String threeCode);

    Double getSumAnfmeProcessed2(String matnr, String threeCode);


    Double getSumAnfmeDb(String matnr, String threeCode, Integer floor);

    Double getSumAnfmeback(String matnr, String threeCode, Integer floor);

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

@@ -224,6 +224,11 @@
    }

    @Override
    public Double getSumAnfmeProcessed2(String matnr, String threeCode) {
        return this.baseMapper.selectSumAnfmeByMatnrProcessed2(matnr, threeCode);
    }

    @Override
    public Double getSumAnfmeDb(String matnr, String threeCode, Integer floor) {
        return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
    }

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: prod
    active: loc

 src/main/webapp/static/js/user/user.js

@@ -25,6 +25,7 @@
            {type: 'checkbox'}
            // ,{field: 'hostName', align: 'center',title: '授权商户', templet: '#hostTpl', width: 140}
            // ,{field: 'nickname', align: 'center',title: '用户名'}
            ,{field: 'id', align: 'center',title: '编号'}
            ,{field: 'username', align: 'center',title: '登录账户'}
            ,{field: 'mobile', align: 'center',title: '手机号'}
            // ,{field: 'deptName', align: 'center',title: '所属部门'}

 src/main/webapp/views/user/user.html

@@ -32,6 +32,12 @@
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline">
                                <label class="layui-form-label">编号:</label>
                                <div class="layui-input-inline">
                                    <input name="id" class="layui-input" placeholder="输入编号"/>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label">用户名:</label>
                                <div class="layui-input-inline">
                                    <input name="username" class="layui-input" placeholder="输入用户名"/>
@@ -153,7 +159,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/user/user.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/user/user.js?v=1" charset="utf-8"></script>

<!-- 项目编辑窗口 -->
<script type="text/html" id="hostEditDialog">

 src/main/webapp/views/wrkMastDetlLog/wrkMastDetlLog.html

@@ -74,7 +74,13 @@
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="order_no" placeholder="单据编号"
                            <input class="layui-input" type="text" name="order_no" placeholder="主订单号"
                                   autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="three_code" placeholder="销售单号"
                                   autocomplete="off">
                        </div>
                    </div>