#显示优化

LSH

2023-01-04 5e89cb64a5cc8c60d22aa477799112e4b0d60157

#显示优化

 src/main/java/com/zy/ints/entity/ErpDetTb.java

@@ -166,4 +166,18 @@
        }
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }

}

 src/main/java/com/zy/ints/entity/ErpDetTbBak.java

@@ -146,5 +146,19 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/ErpLk.java

@@ -94,5 +94,19 @@
//            null    // 备用字段3
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/ErpLkBak.java

@@ -93,5 +93,19 @@
//            null    // 备用字段3
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/LkDetTb.java

@@ -146,5 +146,19 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/LkDetTbBak.java

@@ -146,5 +146,19 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/Prdt.java

@@ -76,5 +76,19 @@
//            null    // 状态[非空]
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/entity/PrdtBak.java

@@ -75,5 +75,19 @@
//            null    // 状态[非空]
//    );

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 0:
                return "0(初始状态)";
            case 1:
                return "1(已接收)";
            case 2:
                return "2(异常)";
            default:
                return String.valueOf(this.status);
        }
    }


}

 src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java

@@ -194,7 +194,7 @@

    public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发订单信息", tableName, "null", ip,
                "订单号：" + erpDetTb.getBillNo() + "、品号：" + erpDetTb.getPrdNo() + "、货品特征：" + erpDetTb.getPrdMark() + "、状态：" + erpDetTb.getStatus(),
                "订单号：" + erpDetTb.getBillNo() + "、品号：" + erpDetTb.getPrdNo() + "、货品特征：" + erpDetTb.getPrdMark() + "、状态：" + erpDetTb.getStatus$(),
                response, bool);
    }
}

 src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java

@@ -46,8 +46,10 @@
    public void proofread() {
        if (!erpEnabled) return;
        String sqlSelectErpLk = "select prd_no as prdNo,prd_mark as prdMark,qty,wh,status,temp1,temp2,temp3 from bas_erp_lk where 1=1";
        String sqlSelectErpLkBak = "select prd_no as prdNo,prd_mark as prdMark,qty,wh,status,temp1,temp2,temp3 from bas_erp_lk_bak where 1=1";
        String sqlUpDateErpLkOne = "update bas_erp_lk set status=1 where prd_no=";
        String sqlUpDateErpLkTwo = "update bas_erp_lk set status=2 where prd_no=";
        String sqlUpDateErpLkBak = "update bas_erp_lk_bak set qty=";

        try {
            List<ErpLk> erpLks = erpSqlServer.select(sqlSelectErpLk, ErpLk.class);
@@ -75,24 +77,32 @@
                            callApiLogSave(erpLk, "bas_erp_lk", "立库库存异常！！！相同品号、货品特征的货物重复！！！", false);
                        }
                    } else if (status == 1) {
                        HashMap<String, Object> condition = new HashMap<>();
                        condition.put("prd_no", "'" + erpLk.getPrdNo() + "'");
                        condition.put("prd_mark", "'" + erpLk.getPrdMark() + "'");
                        condition.put("qty", "'" + erpLk.getQty() + "'");
                        condition.put("wh", "'" + erpLk.getWh() + "'");
                        condition.put("status", "'" + erpLk.getStatus() + "'");
                        condition.put("temp1", "'" + erpLk.getTemp1() + "'");
                        condition.put("temp2", "'" + erpLk.getTemp2() + "'");
                        condition.put("temp3", "'" + erpLk.getTemp3() + "'");
                        erpSqlServer.insert(ErpLkBak.class, condition);

                        List<ErpLkBak> erpLkBaks = erpSqlServer.select(sqlSelectErpLkBak + " and prd_no='" + erpLk.getPrdNo() + "' and prd_mark='" + erpLk.getPrdMark() + "'", ErpLkBak.class);
                        if (erpLkBaks.size() == 1) {
                            erpSqlServer.update(sqlUpDateErpLkBak + "'" + erpLk.getQty() + "' where 1=1  " +
                                    "and prd_no='" + erpLk.getPrdNo() + "'" +
                                    "and prd_mark='" + erpLk.getPrdMark() + "'"
                            );
                        } else if (erpLkBaks.size() == 0) {
                            HashMap<String, Object> condition = new HashMap<>();
                            condition.put("prd_no", "'" + erpLk.getPrdNo() + "'");
                            condition.put("prd_mark", "'" + erpLk.getPrdMark() + "'");
                            condition.put("qty", "'" + erpLk.getQty() + "'");
                            condition.put("wh", "'" + erpLk.getWh() + "'");
                            condition.put("status", "'" + erpLk.getStatus() + "'");
                            condition.put("temp1", "'" + erpLk.getTemp1() + "'");
                            condition.put("temp2", "'" + erpLk.getTemp2() + "'");
                            condition.put("temp3", "'" + erpLk.getTemp3() + "'");
                            erpSqlServer.insert(ErpLkBak.class, condition);
                        } else {
                            callApiLogSave(erpLk, "bas_erp_lk", "库存对比记录备份存在异常！！！", false);
                        }
//                        callApiLogSave(erpLk, "bas_erp_lk", "库存对比记录备份成功！！！总量为：" + erpLk.getQty(), true);

                        HashMap<String, String> condition2 = new HashMap<>();
                        condition2.put("prd_no", "'" + erpLk.getPrdNo() + "'");
                        condition2.put("prd_mark", "'" + erpLk.getPrdMark() + "'");
                        erpSqlServer.delete(ErpLk.class, condition2);

//                        callApiLogSave(erpLk, "bas_erp_lk", "库存对比记录备份后删除成功！！！总量为：" + erpLk.getQty(), true);

                    } else {
@@ -108,7 +118,7 @@

    public void callApiLogSave(ErpLk erpLk, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP与lk库存数据比对", tableName, "null", ip,
                "品号：" + erpLk.getPrdNo() + "、货品特征：" + erpLk.getPrdMark() + "、数量：" + erpLk.getQty() + "、状态：" + erpLk.getStatus(),
                "品号：" + erpLk.getPrdNo() + "、货品特征：" + erpLk.getPrdMark() + "、数量：" + erpLk.getQty() + "、状态：" + erpLk.getStatus$(),
                response, bool);
    }
}

 src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java

@@ -141,7 +141,7 @@

    public void callApiLogSave(Prdt prdt, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发商品信息", tableName, "null", ip,
                "品号：" + prdt.getPrdNo() + "、品名：" + prdt.getName() + "、类型：" + prdt.getType() + "、状态：" + prdt.getStatus(),
                "品号：" + prdt.getPrdNo() + "、品名：" + prdt.getName() + "、类型：" + prdt.getType() + "、状态：" + prdt.getStatus$(),
                response, bool);
    }
}

 src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java

@@ -135,13 +135,13 @@

    public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) {
        apiLogService.save("上报完结订单明细信息", tableName, "null", ip,
                "订单号：" + lkDetTb.getBillNo() + "、品号：" + lkDetTb.getPrdNo() + "、货品特征：" + lkDetTb.getPrdMark() + "、状态：" + lkDetTb.getStatus(),
                "订单号：" + lkDetTb.getBillNo() + "、品号：" + lkDetTb.getPrdNo() + "、货品特征：" + lkDetTb.getPrdMark() + "、状态：" + lkDetTb.getStatus$(),
                response, bool);
    }

    public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) {
        apiLogService.save("上报完结订单明细信息", tableName, "null", ip,
                "订单号：" + lkDetTbBak.getBillNo() + "、品号：" + lkDetTbBak.getPrdNo() + "、货品特征：" + lkDetTbBak.getPrdMark() + "、状态：" + lkDetTbBak.getStatus(),
                "订单号：" + lkDetTbBak.getBillNo() + "、品号：" + lkDetTbBak.getPrdNo() + "、货品特征：" + lkDetTbBak.getPrdMark() + "、状态：" + lkDetTbBak.getStatus$(),
                response, bool);
    }