Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-11 0ff927605ae5df1cb63fbe6cb838c35da43be8ac

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -43,6 +43,9 @@
    @Autowired
    private DocTypeService docTypeService;

    @Value("${spring.profiles.active}")
    private String active;

    @Value("${u8.url}")
    private String url;

@@ -92,7 +95,7 @@
    @Transactional
    public void timelyStart(Order order) {

        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单","其他入库单","其他出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (docNames.contains(docType.getDocName())) {
@@ -125,8 +128,13 @@
    }

    public void mappingParam(Order order, ReportErpParam param) {
        //param.set操作系统号(order.getDefNumber());
        param.set操作系统号("998");
        if (active.equals("prod")) {
            param.set操作系统号(order.getDefNumber());
        } else if (active.equals("dev") || active.equals("loc")) {
            param.set操作系统号("998");
        } else {
            param.set操作系统号(order.getDefNumber());
        }
        param.set操作单据(order.getDocType$());
        param.set操作类型("add");
        param.setDdate(order.getInTime());