#

LSH

2023-12-16 7578bc1bc60fe8cbed874733ad7c5dce133f57ce

#

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

@@ -65,6 +65,12 @@
    @RequestMapping(value = "/locInPrintMat/add/auth")
    @ManagerAuth
    public R add(LocInPrintMat locInPrintMat) {
        Date now = new Date();
        locInPrintMat.setUuid(String.valueOf(now.getTime()));
        locInPrintMat.setUpdateTime(now);
        locInPrintMat.setCreateBy(getUserId());
        locInPrintMat.setUpdateTime(now);
        locInPrintMat.setUpdateBy(getUserId());
        locInPrintMatService.insert(locInPrintMat);
        return R.ok();
    }

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

@@ -289,6 +289,8 @@
            print.setBatch(locInPrintMat.getBatch());
            print.setAnfme(locInPrintMat.getAnfme());
            print.setLocNo(locInPrintMat.getLocNo());
            print.setOwnerId(locInPrintMat.getOwnerId());
            print.setOwner(locInPrintMat.getOwner$());
            print.setId(locInPrintMat.getId());
            res.add(print);
            locInPrintMat.setUpdateTime(new Date());

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

@@ -5,6 +5,7 @@
import com.core.common.Cools;import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -112,6 +113,12 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    /**
     * 商品名称
     */
    @ApiModelProperty(value= "商品名称")
    private Long ownerId;

    public LocInPrintMat() {}

    public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
@@ -130,7 +137,7 @@
    }

    public LocInPrintMat(Date now,Long userId,String matnr,String batch,Double anfme,String locNo,String maktx) {
        this.uuid = now.toString();
        this.uuid = String.valueOf(now.getTime());
        this.createTime = now;
        this.createBy = userId;
//        this.updateTime = now;
@@ -185,6 +192,15 @@
        return null;
    }

    public String getOwner$(){
        LocOwnerService locOwnerService = SpringUtils.getBean(LocOwnerService.class);
        LocOwner locOwner = locOwnerService.selectById(this.ownerId);
        if (!Cools.isEmpty(locOwner)){
            return String.valueOf(locOwner.getOwner());
        }
        return null;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";

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

@@ -55,6 +55,16 @@
    private Long id;

    /**
     * 货主号
     */
    private Long ownerId;

    /**
     * 货主
     */
    private String owner;

    /**
     * 备注
     */
    private String memo;

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

@@ -962,8 +962,19 @@
    public R manDetlOrigin(JSONObject json, User user) {
        Date now = new Date();
        String jsonLocNo = (String) json.get("locNo"); //获取库位码
        Long ownerId = (Long) json.get("owner"); //获取拥有者
        String jsonCode = (String) json.get("code"); //获取条码
        String jsonOrigin = (String) json.get("origin"); //获取来源地
        if (Cools.isEmpty(jsonLocNo)){
            return R.error("库位号参数为空！");
        }else if (Cools.isEmpty(ownerId)){
            return R.error("拥有者参数为空！");
        }else if (Cools.isEmpty(jsonCode)){
            return R.error("条码参数为空！");
        }else if (Cools.isEmpty(jsonOrigin)){
            return R.error("来源地参数为空！");
        }
        Integer jsonOwner = ownerId.intValue(); //获取拥有者
        OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
                .eq("origin_address", jsonOrigin));

@@ -998,9 +1009,11 @@
            }
            //增加打印档案
            LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
            locInPrintMat.setOwnerId(ownerId);
            locInPrintMatService.insert(locInPrintMat);

            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date);
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date).eq("owner",jsonOwner);
            ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
            if(!Cools.isEmpty(manLocDetl1)){
                BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1031,6 +1044,7 @@
                manLocDetl.setModiTime(now);
                // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                manLocDetl.setStockFreeze(1);
                manLocDetl.setOwner(jsonOwner);

                if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                    return R.error("物料信息入库失败");
@@ -1045,7 +1059,13 @@
    public R manDetlOrigInNo(JSONObject json, User user) {
        Date now = new Date();
        String jsonLocNo = (String) json.get("locNo"); //获取库位码

        Long ownerId = (Long) json.get("owner"); //获取拥有者
        if (Cools.isEmpty(jsonLocNo)){
            return R.error("库位号参数为空！");
        }else if (Cools.isEmpty(ownerId)){
            return R.error("拥有者参数为空！");
        }
        Integer jsonOwner = ownerId.intValue(); //获取拥有者
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo));  //获取对应库位信息
        if (Cools.isEmpty(node)){
            return R.error("未查询到库位信息");
@@ -1061,9 +1081,11 @@
            }
            //增加打印档案
            LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
            locInPrintMat.setOwnerId(ownerId);
            locInPrintMatService.insert(locInPrintMat);

            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch());
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch()).eq("owner",jsonOwner);
            ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
            if(!Cools.isEmpty(manLocDetl1)){
                BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1092,6 +1114,7 @@
                manLocDetl.setCreateTime(now);
                manLocDetl.setUpdateBy(user.getId());
                manLocDetl.setModiTime(now);
                manLocDetl.setOwner(jsonOwner);
                // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                manLocDetl.setStockFreeze(1);

@@ -1110,10 +1133,11 @@
        for (int i = 0; i < combMats.size(); i++) {
            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());
            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
            ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
            if (Cools.isEmpty(manLocDetl)){
                return R.error("未商品明细信息!库位号："+jsonOriginDetl.getLocNo()+";商品编号："+jsonOriginDetl.getMatnr()+"批次："+jsonOriginDetl.getBatch());
                return R.error("未查询到商品明细信息!库位号："+jsonOriginDetl.getLocNo()+";商品编号："+jsonOriginDetl.getMatnr()+"批次："+jsonOriginDetl.getBatch()+"货主"+jsonOriginDetl.getOwnerId());
            }
            BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
            BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());

 src/main/resources/mapper/LocInPrintMatMapper.xml

@@ -17,6 +17,8 @@
        <result column="anfme" property="anfme" />
        <result column="loc_no" property="locNo" />
        <result column="maktx" property="maktx" />
        <result column="owner_id" property="ownerId" />
        <result column="owner" property="owner" />

    </resultMap>


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

@@ -30,6 +30,7 @@
            ,{field: 'anfme', align: 'center',title: '重量(kg)', width:100,hide: false}
            ,{field: 'locNo', align: 'center',title: '库位号', width:120,hide: false}
            ,{field: 'maktx', align: 'center',title: '商品名称',hide: false}
            ,{field: 'owner$', align: 'center',title: '货主',hide: false}
            ,{field: 'createTime$', align: 'center',title: '入库时间', width:120,hide: false}
            ,{field: 'createBy$', align: 'center',title: '入库人员', width:100,hide: false}
            ,{field: 'updateTime$', align: 'center',title: '打印时间', width:120,hide: false}
@@ -274,9 +275,17 @@
                        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].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
                            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].ownerId+";"+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].locNo+";"+res.data[i].maktx+";"+res.data[i].id;
                            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].ownerId+";"+res.data[i].maktx+";"
                                +res.data[i].id;
                        }
                    }
                    var tpl = templateDom.html();

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

@@ -53,6 +53,25 @@
            color: black;
        }

        #templatePreview3 {
            color: black;
            border-color: black;
            border-collapse: collapse; /* 折叠边框 */
        }

        /* 将样式只应用到具有特定id的table、th、td */
        #templatePreview3, #myTable th, #myTable td {
            color: black;
            border: 2px solid black; /* 2像素黑色边框 */
        }

        #templatePreview3 th, #myTable td {
            color: black;
            border-color: black;
            text-align: left;
            padding: 8px;
        }

    </style>
</head>
<body>
@@ -78,6 +97,11 @@
                            </select>
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="ownerId" placeholder="货主" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
@@ -132,6 +156,12 @@
                            <option value="1">未打印</option>
                            <option value="2">已打印</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">货主编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="owner" placeholder="请输入货主编号">
                    </div>
                </div>
                <div class="layui-form-item">
@@ -327,7 +357,7 @@
            <td colspan="2"><strong>{{this.maktx}}</strong></td>
            <td colspan="3" rowspan="4" class="barcode-section" style="white-space: normal; ">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" alt="Barcode Image">
                <div><span >{{this.matnr}}</span></div>
                <div><span >{{this.owner}}</span></div>
            </td>
        </tr>
        <tr>
@@ -342,6 +372,10 @@
            <th>库位</th>
            <td colspan="2"><strong>{{this.locNo}}</strong></td>
        </tr>
        <tr>
            <th>品号</th>
            <td colspan="5"><strong>{{this.matnr}}</strong></td>
        </tr>
    </table>
    {{/each}}
</script>