自动化立体仓库 - WMS系统
2d68b0241edf83823bedba2392b81c9f0957a7d3..5c6693c727d37f2c64c7ecded5a7d96b28eacf2e
2025-05-22 lty
#k库龄bug修复
5c6693 对比 | 目录
2025-05-22 lty
#重量写入bug修复
3a0803 对比 | 目录
2025-05-22 lty
#
87ecfa 对比 | 目录
2025-05-22 lty
Merge remote-tracking branch 'origin/tzglasrs' into tzglasrs
8b3be4 对比 | 目录
2025-05-22 lty
#页面更改
d4beac 对比 | 目录
2025-05-22 lty
#
147d42 对比 | 目录
4个文件已修改
22 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/LocDetl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -166,6 +166,7 @@
    @TableField("out_order_no")
    private String outOrderNo;
    /**
     * 炉号\客户图号
     */
@@ -292,13 +293,16 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }
    public long getStoreDate(){
        long timeNow = new Date().getTime();
    public Long getStoreDate() {
        if (this.appeTime == null) {
            return null;  // 或者返回 -1L、0L,看你的业务逻辑
        }
        long timeNow = System.currentTimeMillis();
        long timeCreate = this.appeTime.getTime();
        return (timeNow - timeCreate) /24/60/60/1000;
        return (timeNow - timeCreate) / (24 * 60 * 60 * 1000);
    }
    public void sync(Object source) {
        Synchro.Copy(source, this);
    }
src/main/java/com/zy/common/web/WcsController.java
@@ -366,6 +366,7 @@
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWeight(wrkMast.getScWeight());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
@@ -379,7 +380,8 @@
                    wrkDetl.setSPgNO(orderDetl.getSPgNO());
                    wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
//                    wrkDetl.setLuHao(orderDetl.getLuHao());
                    wrkDetl.setWeight(weight);
                    wrkDetl.setSupp(orderDetl.getSupp());
                    wrkDetl.setSuppCode(orderDetl.getSuppCode());
                    wrkDetl.setPacking(orderDetl.getPacking());
                    wrkDetl.setColor(orderDetl.getColor());
                    wrkDetl.setWareId(orderDetl.getWareId());
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -122,6 +122,8 @@
//            orderDetl.setLuHao(outDetTB.getLuHao());
//            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setPacking(outDetTB.getPacking());
            orderDetl.setSuppCode(inHedTB.getObjectId());
            orderDetl.setSupp(inHedTB.getObjectName());
            orderDetl.setWareId(outDetTB.getWareId());
            orderDetl.setWareName(outDetTB.getWareName());
            orderDetl.setBatch(outDetTB.getItemBatch());
@@ -225,6 +227,8 @@
            orderDetl.setDetId(outDetTB.getDetId());
//            orderDetl.setLuHao(outDetTB.getLuHao());
            orderDetl.setSpecs(outDetTB.getSPgNO());
            orderDetl.setSuppCode(inHedTB.getObjectId());
            orderDetl.setSupp(inHedTB.getObjectName());
            orderDetl.setPacking(outDetTB.getPacking());
            orderDetl.setWareId(outDetTB.getWareId());
            orderDetl.setWareName(outDetTB.getWareName());
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -237,7 +237,7 @@
        if (!Cools.isEmpty(orderDetl.getModel())) content.put("item_code", "'" + orderDetl.getModel() + "'");
        if (!Cools.isEmpty(orderDetl.getBatch())) content.put("item_batch", "'" + orderDetl.getBatch() + "'");
        if (!Cools.isEmpty(orderDetl.getProType())) content.put("pro_type", "'" + orderDetl.getProType() + "'");
        if (!Cools.isEmpty(orderDetl.getUpdateTime())) content.put("make_date", "'" + orderDetl.getUpdateTime() + "'");
        if (!Cools.isEmpty(orderDetl.getUpdateTime())) content.put("make_date", "'" + orderDetl.getUpdateTime$() + "'");
        if (!Cools.isEmpty(orderDetl.getMemo())) content.put("remark", "'" + orderDetl.getMemo() + "'");
        if (!Cools.isEmpty(orderDetl.getOutOrderNo())) content.put("order_no", "'" + orderDetl.getOutOrderNo() + "'");
        if (!Cools.isEmpty(orderDetl.getQty())) {