#

luxiaotao1123

2021-12-07 a955772ea0908d6747035661e9bcffb7fb4ba961

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -17,6 +17,7 @@
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.MatCodeMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
@@ -40,6 +41,7 @@
    public static final String GET_BASIS = "cM/basis/getBasis";
    public static final String UPLOAD_BILL = "cM/basis/uploadBill";
    public static final String UPLOAD_STOCK = "cM/basis/uploadStock";
    public static final String GET_STOCK = "cM/ptype/GetStock";
    public static final String OVER_BILL = "cM/basis/OverBill";
    public static final String UPLOAD_CANCEL_RESULT = "cM/basis/cancelOrders";

@@ -67,6 +69,9 @@
    private DocLogService docLogService;
    @Autowired
    private RequestLogService requestLogService;
    @Autowired
    private MatCodeMapper matCodeMapper;


    /**
     * 商品下载
@@ -170,6 +175,7 @@
                    }

                    if (null == mat) {
                        // 平仓
                        mat = new Mat(
                                String.valueOf(data.getRec()),    // 编号
                                null,    // 所属区域
@@ -195,8 +201,12 @@
                                updateTime,    // 修改时间
                                null    // 备注
                        );

                        matService.insert(mat);
                        // 立库

                    } else {
                        // 平仓
                        mat.setUuid(String.valueOf(data.getRec()));
                        mat.setMatnr(data.getUserCode());
                        mat.setMaktx(data.getFullName());
@@ -205,6 +215,8 @@
                        mat.setBarcode(data.getBarcode());
                        mat.setUnit(data.getUnit3());
                        matService.updateById(mat);
                        // 立库

                    }
                    log.info("====>> 更新物料：{}", data.getUserCode());
                }
@@ -341,7 +353,11 @@
                                updateTime,    // 修改时间
                                null    // 备注
                        );
                        matService.insert(mat);
                        if (matService.insert(mat)) {
                            MatCode matCode = mat.beMatCode();
                            matCodeMapper.insert(matCode);
                        }

                    } else {
                        mat.setUuid(String.valueOf(data.getRec()));
                        mat.setMatnr(data.getUserCode());
@@ -350,7 +366,10 @@
                        mat.setUpdateTime(updateTime);
                        mat.setBarcode(data.getBarcode());
                        mat.setUnit(data.getUnit3());
                        matService.updateById(mat);
                        if (matService.updateById(mat)) {
                            MatCode matCode = mat.beMatCode();
                            matCodeMapper.updateById(matCode);
                        }
                    }
                    log.info("====>> 更新物料：{}", data.getUserCode());
                }