#货物形态转换解除限制，正反向随意

LSH

2023-07-19 1cf3f1550a847b05cc6ec9c474b304f503aa9fc6

#货物形态转换解除限制，正反向随意

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

@@ -345,6 +345,7 @@
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        String payment = String.valueOf(param.get("payment"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);
        }
@@ -354,6 +355,9 @@
        if (!Cools.isEmpty(owner) && !owner.equals("null")) {
            locDetlDTO.setOwner(owner);
        }
        if (!Cools.isEmpty(payment) && !payment.equals("null")) {
            locDetlDTO.setPayment(payment);
        }
        List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
        int count = locDetlService.selectAllPymentcount(locDetlDTO);
        Page<LocDetlAll> page = new Page<>();

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

@@ -51,6 +51,7 @@
     * 添加入库单
     */
    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "添加订单入库")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {

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

@@ -103,7 +103,7 @@
    @ManagerAuth(memo = "货物形态转换")
    public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
        workService.turnOverOutPayment(param, getUserId());
        return R.ok("货物形态已转为仓储");
        return R.ok("货物形态已转为"+param.getPayment$(param.getPayment()));
    }

    @RequestMapping("/empty/plate/in/start")

 src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java

@@ -19,6 +19,9 @@
    // 客户id
    private Integer ownerId;

    //货物形态
    private Integer payment;

    // 库位号集合
    private List<String> locNos;

@@ -66,4 +69,13 @@
    public void setLocNos(List<String> locNos) {
        this.locNos = locNos;
    }

    public String getPayment$(Integer payment){
        if (payment.equals(0)){
            return "代采";
        }else if (payment.equals(1)){
            return "仓储";
        }
        return payment.toString();
    }
}

 src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java

@@ -11,4 +11,5 @@
    private String locNo;
    private String matnr;
    private String owner;
    private String payment;
}

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

@@ -1188,6 +1188,10 @@
    @Override
    @Transactional
    public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) {
        if (Cools.isEmpty(param.getPayment())){
            throw new CoolException("请选择目标货物形态");
        }
        log.info("更新货物形态：目标货物形态："+param.getPayment$(param.getPayment())+";更改货物信息："+param.getLocDetls());
        try {
            if (param.getLocDetls().size()<=0){
                throw new CoolException("请提取明细");
@@ -1208,7 +1212,7 @@
                if (locNo1[1].equals("平库")){
                    List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
                    for (ManLocDetl manLocDetl:manLocDetls){
                        manLocDetl.setPayment(1);
                        manLocDetl.setPayment(param.getPayment());
                        try{
                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                        }catch (Exception e){
@@ -1218,7 +1222,7 @@
                }else if (locNo1[1].equals("立库")){
                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                    for (LocDetl locDetl:locDetls){
                        locDetl.setPayment(1);
                        locDetl.setPayment(param.getPayment());
                        try{
                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                        }catch (Exception e){

 src/main/resources/mapper/LocDetlMapper.xml

@@ -509,6 +509,9 @@
        <if test="owner != null and owner !='' ">
            and t.owner like '%' + #{owner} + '%'
        </if>
        <if test="payment != null and payment !='' ">
            and t.payment = #{payment}
        </if>

    </sql>
    <select id="selectAllOwner" resultType="com.zy.asrs.entity.result.LocDetlAll" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
@@ -536,7 +539,7 @@
        SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
        SELECT * FROM asr_loc_detl_all
        ) t
        WHERE 1=1 and t.payment = 0
        WHERE 1=1
        <include refid="selectAllSql"></include>
        ) a
        WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -549,7 +552,7 @@
        SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
        SELECT * FROM asr_loc_detl_all
        ) t
        WHERE 1=1 and t.payment = 0
        WHERE 1=1
        <include refid="selectAllSql"></include>
        ) a


 src/main/webapp/static/js/pakStore/turnOver2.js

@@ -3,7 +3,7 @@
function getCol() {
    var cols = [
        {field: 'anfme', align: 'center',title: '库存数量'}
        ,{field: 'locNo$', align: 'center',title: '库位号'}
        ,{field: 'loc_no', align: 'center',title: '库位号'}
    ];
    arrRemove(detlCols,  'field', 'anfme');
    cols.push.apply(cols, detlCols);
@@ -77,12 +77,13 @@
                if (locDetlData.length === 0){
                    layer.msg('请先提取商品库存', {icon: 2});
                } else {
                    // var staNo = $("#staNoSelect").val();
                    // if (staNo === "" || staNo === null){
                    //     layer.msg("请选择目标货主", {icon: 2});
                    //     return;
                    // }
                    var payment = $("#staNoPaymentSelect").val();
                    if (payment === "" || payment === null){
                        layer.msg("请选择目标货物形态", {icon: 2});
                        return;
                    }
                    let param = {
                        payment: payment,
                        locDetls: locDetlData
                    }
                    $.ajax({

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

@@ -95,13 +95,15 @@
    <script type="text/html" id="toolbar">
        <div class="layui-form">
            <div class="layui-btn-container">
<!--                &lt;!&ndash; 1.选择客户 &ndash;&gt;-->
<!--                <span id="staNoSpan">货主：</span>-->
<!--                <select id="staNoSelect" lay-verify="required">-->
<!--                    <option value="">请选择目标货主</option>-->
<!--                </select>-->
                <!-- 1.选择客户 -->
                <span id="staNoPaymentSpan">货物形态：</span>
                <select id="staNoPaymentSelect" lay-verify="required">
                    <option value = ""  disabled selected hidden > 请选择目标货物形态 </option>
                    <option value="0">代采</option>
                    <option value="1">仓储</option>
                </select>
                <!-- 2.启动出库 -->
                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outboundPayment">转换货物形态为仓储</button>
                <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outboundPayment">转换货物形态</button>
            </div>
        </div>
    </script>

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

@@ -62,6 +62,11 @@
                <input class="layui-input" type="text" name="owner$" placeholder="货主" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="payment" 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>
@@ -91,7 +96,7 @@
    function getCol() {
        var cols = [
            {type: 'checkbox'}
            ,{field: 'locNo$', align: 'center',title: '库位号'}
            ,{field: 'loc_no', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}