#ERP对接优化

LSH

2023-01-04 a740e5dfd94871f23b9ef859d0b552ade6790fff

#ERP对接优化

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

@@ -171,7 +171,7 @@
                        condition.put("temp3", "'" + erpDetTb.getTemp3() + "'");
                        erpSqlServer.insert(ErpDetTbBak.class, condition);

                        callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP下发订单备份成功！！", true);
//                        callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP下发订单备份成功！！", true);

                        HashMap<String, String> condition2 = new HashMap<>();
                        condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
@@ -179,7 +179,7 @@
                        condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
                        erpSqlServer.delete(ErpDetTb.class, condition2);

                        callApiLogSave(erpDetTb, "erp_det_tb", "ERP下发订单备份后删除成功！！", true);
//                        callApiLogSave(erpDetTb, "erp_det_tb", "ERP下发订单备份后删除成功！！", true);

                    } else {
                        callApiLogSave(erpDetTb, "erp_det_tb", "接收ERP下发订单失败！！！状态异常！！！", false);

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

@@ -61,7 +61,7 @@
                        param.put("matnr", erpLk.getPrdNo());
                        param.put("batch", erpLk.getPrdMark());
                        Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(1, 10, param, LocDetl.class));
                        if (stockStatis.getSize() == 1) {
                        if (stockStatis.getRecords().size() == 1) {
                            for (LocDetl locDetl : stockStatis.getRecords()) {
                                if (locDetl.getAnfme() - erpLk.getQty() == 0) {
                                    erpSqlServer.update(sqlUpDateErpLkOne + "'" + erpLk.getPrdNo() + "' and prd_mark='" + erpLk.getPrdMark() + "'");
@@ -86,14 +86,14 @@
                        condition.put("temp3", "'" + erpLk.getTemp3() + "'");
                        erpSqlServer.insert(ErpLkBak.class, condition);

                        callApiLogSave(erpLk, "bas_erp_lk", "库存对比记录备份成功！！！总量为：" + erpLk.getQty(), true);
//                        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.getPrdNo() + "'");
                        condition2.put("prd_mark", "'" + erpLk.getPrdMark() + "'");
                        erpSqlServer.delete(ErpLk.class, condition2);

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

                    }else {
                        callApiLogSave(erpLk, "bas_erp_lk", "库存对比存在异常数据未处理！！！", false);

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

@@ -122,12 +122,12 @@
                        condition.put("type", "'" + prdt.getType() + "'");
                        condition.put("status", "'" + prdt.getStatus() + "'");
                        erpSqlServer.insert(PrdtBak.class, condition);
                        callApiLogSave(prdt, "erp_prdt_bak", "ERP下发商品信息备份成功！", true);
//                        callApiLogSave(prdt, "erp_prdt_bak", "ERP下发商品信息备份成功！", true);

                        HashMap<String, String> condition2 = new HashMap<>();
                        condition2.put("prd_no", "'" + prdt.getPrdNo() + "'");
                        erpSqlServer.delete(Prdt.class, condition2);
                        callApiLogSave(prdt, "erp_prdt_bak", "ERP下发商品信息备份后删除成功！", true);
//                        callApiLogSave(prdt, "erp_prdt_bak", "ERP下发商品信息备份后删除成功！", true);
                    } else {
                        callApiLogSave(prdt, "erp_prdt", "商品信息出现异常资料未处理！", false);
                    }

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

@@ -110,7 +110,7 @@
                            }
                            //保存订单明细历史档
                            if (orderDetlService.addToLogTable(orderDetl)) {
                                callApiLogSaveOrderDetl(orderDetl, "保存订单明细历史档成功！", true);
//                                callApiLogSaveOrderDetl(orderDetl, "保存订单明细历史档成功！", true);
                                //删除订单明细
                                orderDetlService.deleteById(orderDetl.getId());
                                callApiLogSaveOrderDetl(orderDetl, "订单明细档保存后删除成功！", true);
@@ -118,7 +118,7 @@
                        }
                        //保存订单历史档
                        if (orderService.addToLogTable(order)) {
                            callApiLogSaveOrder(order, "完结订单上报完成，并保存订单历史档成功！！！", true);
//                            callApiLogSaveOrder(order, "完结订单上报完成，并保存订单历史档成功！！！", true);
                            //删除完结订单
                            orderService.deleteById(order.getId());
                            callApiLogSaveOrder(order, "完结订单上报完成，并保存订单历史档后删除完结订单成功！！！", true);

 src/main/resources/mapper/LocDetlMapper.xml

@@ -103,6 +103,9 @@
        <if test="crnNo!=null and crnNo!='' ">
            and b.crn_no=#{crnNo}
        </if>
        <if test="batch!=null and batch!='' ">
            and a.batch like '%' + #{batch} + '%'
        </if>
    </sql>

    <select id="getStockOutPage" resultMap="BaseResultMap">