diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/order/SalesOrderDetailDTO.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/order/SalesOrderDetailDTO.java deleted file mode 100644 index ad02ef4..0000000 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/dto/order/SalesOrderDetailDTO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.digiwin.athena.app.infra.dto.order; - -import com.google.gson.annotations.SerializedName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author CR-7 - * create: 2023-04-27 14:41 - * Description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class SalesOrderDetailDTO { - - /** - * 主键id - */ - @SerializedName(value = "id") - private Long id; - - /** - * 订单单号 - */ - @SerializedName(value = "doc_no") - private String docNo; - - /** - * 序号 - */ - @SerializedName(value = "doc_seq") - private String docSeq; - - /** - * 品号 - */ - @SerializedName(value = "item_no") - private String itemNo; - - /** - * 品名 - */ - @SerializedName(value = "item_name") - private String itemName; - - /** - * 规格 - */ - @SerializedName(value = "item_spec") - private String itemSpec; - - /** - * 数量 - */ - @SerializedName(value = "qty") - private Integer qty; - - /** - * 仓库 - */ - @SerializedName(value = "warehouse_name") - private String warehouseName; - - /** - * 储位 - */ - @SerializedName(value = "storage_spaces_name") - private String storageSpacesName; - - /** - * 1.未检料;2.已检料 - */ - @SerializedName(value = "status") - private Integer status; - - /** - * 租户sid - */ - @SerializedName(value = "tenantsid") - private Integer tenantsid; -} diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/SalesOrderDetailEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/SalesOrderDetailEAIService.java index e784927..3402931 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/SalesOrderDetailEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/SalesOrderDetailEAIService.java @@ -1,5 +1,6 @@ package com.digiwin.athena.app.provider; + import com.digiwin.app.service.DWEAIResult; import com.digiwin.app.service.DWService; import com.digiwin.app.service.eai.EAIService; diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailCreateEAIService.java index 3843b64..5798834 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailCreateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailCreateEAIService.java @@ -3,7 +3,6 @@ package com.digiwin.athena.app.service.order; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.digiwin.app.service.DWEAIResult; -import com.digiwin.athena.app.infra.dto.order.SalesOrderDetailDTO; import com.digiwin.athena.app.infra.entity.SalesOrderDetailEntity; import com.digiwin.athena.app.infra.service.SalesOrderDetailService; import com.digiwin.athena.opt.common.eai.EAIRequest; @@ -41,7 +40,7 @@ public class SalesOrderDetailCreateEAIService extends AbsEAIService { public DWEAIResult execute(Map headers, String messageBody) throws Exception { // 入参反序列化 EAIRequest request = new EAIRequest(messageBody); - List salesOrderDetailDTOList = request.getObject("sales_order_detail", new TypeReference>(){}); + List salesOrderDetailDTOList = request.getObject("sales_order_detail", new TypeReference>(){}); List salesOrderDetailEntityList = salesOrderDetailDTOList.stream().map(assemble->{ SalesOrderDetailEntity salesOrderDetailEntity = new SalesOrderDetailEntity(); diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailUpdateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailUpdateEAIService.java index c8e92f3..00bf187 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailUpdateEAIService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/order/SalesOrderDetailUpdateEAIService.java @@ -3,7 +3,6 @@ package com.digiwin.athena.app.service.order; import com.alibaba.fastjson.TypeReference; import com.digiwin.app.service.DWEAIResult; -import com.digiwin.athena.app.infra.dto.order.SalesOrderDetailDTO; import com.digiwin.athena.app.infra.entity.SalesOrderDetailEntity; import com.digiwin.athena.app.infra.service.SalesOrderDetailService; import com.digiwin.athena.opt.common.eai.EAIRequest; @@ -40,7 +39,7 @@ public class SalesOrderDetailUpdateEAIService extends AbsEAIService { public DWEAIResult execute(Map headers, String messageBody) throws Exception { // 入参反序列化 EAIRequest request = new EAIRequest(messageBody); - List salesOrderDetailDTOList = request.getObject("sales_order_detail", new TypeReference>(){}); + List salesOrderDetailDTOList = request.getObject("sales_order_detail", new TypeReference>(){}); List salesOrderDetailEntityList = salesOrderDetailDTOList.stream().map(assemble->{ SalesOrderDetailEntity salesOrderDetailEntity = new SalesOrderDetailEntity(); diff --git a/doc/sql/app-20230427-ddl.sql b/doc/sql/app-20230427-ddl.sql index 81c5770..6ac2b66 100644 --- a/doc/sql/app-20230427-ddl.sql +++ b/doc/sql/app-20230427-ddl.sql @@ -1,6 +1,6 @@ -- 订单明细表 -create table `sales_order_detail` ( +create table `cim_sales_order_detail` ( `id` bigint(20) not null comment '主键', `doc_no` varchar(12) default null comment '订单单号', `doc_seq` varchar(255) default null comment '序号', @@ -21,6 +21,8 @@ create table `sales_order_detail` ( `deleted` tinyint(255) DEFAULT NULL, primary key (`id`) ) engine=innodb default charset=utf8mb4 comment='订单明细'; + + -- 新人报道表 CREATE TABLE `cim_staff` ( `id` bigint(20) NOT NULL,