diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDownloadController.java index 3e5f7c4..5dd5744 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDownloadController.java @@ -13,6 +13,7 @@ import com.glxp.sale.admin.service.sync.BasicExportService; import com.glxp.sale.admin.util.RedisUtil; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +@Slf4j @RestController public class BasicDownloadController { @@ -54,7 +56,7 @@ public class BasicDownloadController { @PostMapping("/spssync/basic/udiinfo/downloadByStatus") public BaseResponse downloadByStatus(@RequestBody BasicExportStatusRequest basicExportStatusRequest) { - + log.info("查询下载未更新信息"); if (basicExportStatusRequest.getType() == BasicProcessStatus.BASIC_UDI) {//基础信息下载 String data = (String) redisUtil.get(basicExportStatusRequest.getId() + ""); UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse = JSONObject.parseObject(data, new TypeReference() { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/StockOrderRemakEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/StockOrderRemakEntity.java new file mode 100644 index 0000000..545e476 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/sync/StockOrderRemakEntity.java @@ -0,0 +1,21 @@ +package com.glxp.sale.admin.entity.sync; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class StockOrderRemakEntity { + private Integer id; + private String orderIdFk; + private String relId; + private String batchNo; + private BigDecimal price; + private String secSalesListNo; + private String firstSalesInvNo; + private String secSalesInvNo; + private String invoiceDate; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncOrderResponse.java index 244a6c2..018c323 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncOrderResponse.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.res.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.entity.sync.ErpOrderEntity; import com.glxp.sale.admin.entity.sync.OrderEntity; +import com.glxp.sale.admin.entity.sync.StockOrderRemakEntity; import com.glxp.sale.admin.entity.sync.WarehouseEntity; import lombok.Data; @@ -16,6 +17,7 @@ public class SpsSyncOrderResponse { List orderEntities; List orderDetailEntityList; List warehouseEntityList; + List stockOrderRemakEntities; @Override public String toString() {