#

LSH

2023-12-15 fc45de2fc49363738d5854446ad2ad33b58b1949

#

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

@@ -287,8 +287,9 @@
            print.setMatnr(locInPrintMat.getMatnr());
            print.setMaktx(locInPrintMat.getMaktx());
            print.setBatch(locInPrintMat.getBatch());
            print.setAnfme(locInPrintMat.getAnfme().toString());
            print.setMemo(locInPrintMat.getMemo());
            print.setAnfme(locInPrintMat.getAnfme());
            print.setLocNo(locInPrintMat.getLocNo());
            print.setId(locInPrintMat.getId());
            res.add(print);
            locInPrintMat.setUpdateTime(new Date());
            locInPrintMat.setUpdateBy(getUserId());

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

@@ -403,9 +403,18 @@
        return mobileService.manDetlOrigInNo(json,getUser());
    }

//    @RequestMapping("/manDetl/out/origin")
//    @ManagerAuth(memo = "平库下架")
//    public R manDetlout(@RequestBody JSONObject json){
//        if (json == null){
//            return R.error("传入数据为空");
//        }
//        return mobileService.manDetlOriginOut(json,getUser());
//    }

    @RequestMapping("/manDetl/out/origin")
    @ManagerAuth(memo = "平库下架")
    public R manDetlout(@RequestBody JSONObject json){
    public R manDetlout2(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
        }

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

@@ -41,7 +41,18 @@
    /**
     * 数量
     */
    private String anfme;
    private Double anfme;


    /**
     * 库位号
     */
    private String locNo;

    /**
     * 库位号
     */
    private Long id;

    /**
     * 备注

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

@@ -1106,24 +1106,21 @@

    @Override
    public R manDetlOriginOut(JSONObject json, User user) {
        String jsonLocNo = (String) json.get("locNo"); //获取库位码

        JSONArray combMats = json.getJSONArray("combMats");
        for (int i = 0; i < combMats.size(); i++) {
            OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
            MatPrint jsonOriginDetl = combMats.getObject(i, MatPrint.class);
            Double parseLong = jsonOriginDetl.getAnfme();
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo()).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
            ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
            if (Cools.isEmpty(manLocDetl)){
                return R.error("未商品明细信息!库位号："+jsonLocNo+";商品编号："+jsonOriginDetl.getMatnr()+"批次："+jsonOriginDetl.getBatch());
                return R.error("未商品明细信息!库位号："+jsonOriginDetl.getLocNo()+";商品编号："+jsonOriginDetl.getMatnr()+"批次："+jsonOriginDetl.getBatch());
            }
            BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
            BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
            BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());

            if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
            if (manLocDetl.getAnfme() > parseLong){
                BigDecimal num = anfme.subtract(outAnfme);
                manLocDetl.setAnfme(num.doubleValue());


                if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
                    return R.error("物料信息下架失败");
                }
@@ -1133,8 +1130,6 @@
                    return R.error("物料信息删除失败");
                }
            }


        }
        return R.ok();
    }

 src/main/webapp/static/js/locInPrintMat/locInPrintMat.js

@@ -274,9 +274,9 @@
                        var templateDom = $("#templatePreview"+templateNo);
                        var className = templateDom.attr("class");
                        if (className === 'template-barcode') {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=1&param="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
                        } else {
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].memo+";"+res.data[i].maktx;
                            res.data[i]["barcodeUrl"]=baseUrl+"/mac/code/auth?type=2&param="+res.data[i].matnr+";"+res.data[i].batch+";"+res.data[i].anfme+";"+res.data[i].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
                        }
                    }
                    var tpl = templateDom.html();

 src/main/webapp/views/locInPrintMat/locInPrintMat.html

@@ -95,7 +95,7 @@

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">批量打印</button>

@@ -335,12 +335,12 @@
            <td colspan="2"><strong>{{this.batch}}</strong></td>
        </tr>
        <tr>
            <th>数量</th>
            <td colspan="2"><strong>{{this.anfme}}</strong></td>
            <th>重量</th>
            <td colspan="2"><strong>{{this.anfme}}kg</strong></td>
        </tr>
        <tr>
            <th>备注</th>
            <td colspan="2"><strong>{{this.memo}}</strong></td>
            <th>库位</th>
            <td colspan="2"><strong>{{this.locNo}}</strong></td>
        </tr>
    </table>
    {{/each}}