From 6adc396aef75ce104f0950b638ee6d2d21743a43 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:02:44 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 6fbc911..994e590 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -160,14 +160,14 @@ public class BfElement extends BaseBean { @ApiParam(value ="默认排序规则") private Integer elementSortAttrType; - @Lob +// @Lob @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") private String elementCssStyle; - @Lob +// @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素样式") + @ApiParam(value ="元素格式化") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION") From fbab36aad2527ff2569092c56d242fbb9cce7999 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 14:40:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQuarantineRecord.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 12 +++- .../repository/MesQuarantineRecordRepository.java | 13 ++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java new file mode 100644 index 0000000..25aa552 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/4 7:16 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUARANTINE_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO") +}) +@Api("隔离记录表") +public class MesQuarantineRecord extends BaseBean { + private static final long serialVersionUID = -4667731056014803186L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("用量") + private Integer qty; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "QUARANTINE_NO") + @ApiParam("隔离单号") + private String quarantineNo; + + @Column(name = "SCRAP_No") + @ApiParam("报废单号") + private String scrapNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index fbc457b..232a945 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Transient; /** @@ -24,7 +25,7 @@ public class StepPrintSnModel extends MesProduceSn { private String printTime; @ApiParam("条码") - private String barCode; + private String /**/barCode; @ApiParam("物料号") private String partNo; @@ -147,4 +148,13 @@ public class StepPrintSnModel extends MesProduceSn { private String tgPartDesc; @ApiParam("泰国过程条码截取前11位") private String snTop11; + + @ApiParam("缺陷代码") + private String defectCode; + @ApiParam("缺陷原因代码") + private String dcCode; + @ApiParam("维修代码") + private String repairCode; + @ApiParam("质量代码") + private String qcCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java new file mode 100644 index 0000000..bf36ba5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/4 7:38 PM + * @Modify: + */ +public interface MesQuarantineRecordRepository extends BaseRepository { +} From 0c4e6359fc89c832578c4e415d003e51a876c920 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 16:45:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?JISA=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 9742449..0b930bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("是否绑定关键件") - private Integer isBingKey; + private Integer isBindKey; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 53f9f82..8dac34b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; + @Transient + @ApiParam("节拍时间") + private Integer cycleTime; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 6b4ae7eb71059afacc76e8399940a0dfb6b9d6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Mar 2021 17:25:53 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=903254=20=E6=B3=B0=E5=9B=BD-?= =?UTF-8?q?=E4=B8=8A=E8=A3=85=E6=80=BB=E6=88=90=E5=A5=97=E8=86=9C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index acf952a..8809df0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -39,7 +39,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Api("去去去去去去去去去安灯记录") +@Api("安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 4667499369694353351L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 232a945..6f6c792 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -157,4 +157,6 @@ public class StepPrintSnModel extends MesProduceSn { private String repairCode; @ApiParam("质量代码") private String qcCode; + @ApiParam("打印机名称") + private String printerName; } From 19872ba443fe92f839fa2d1514ddbd1d5c808eb9 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 20:27:21 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 6f6c792..02668f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -25,7 +25,7 @@ public class StepPrintSnModel extends MesProduceSn { private String printTime; @ApiParam("条码") - private String /**/barCode; + private String barCode; @ApiParam("物料号") private String partNo; From b8d254e55e2261f11c90ef8de171a95a99024adb Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 8 Mar 2021 14:49:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index bc39e95..d7b7966 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1082,7 +1082,8 @@ public class ImppEnumUtil { CONFIG(6, "系统配置"), LOG(7, "日志配置"), WORK_WECHAT(8, "企业微信配置"), - SMS(9, "短信配置"); + SMS(9, "短信配置"), + SSO(10, "单点登录配置"); private final int value; private final String description; From a63334c5a1d27ffb945a0c58b73518d5ea01fd7a Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 9 Mar 2021 13:12:27 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=8B=E5=8A=A1sop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/ExcludeImportExport.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 6 +++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 + .../estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 60 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 6 +++ .../pojo/aps/bean/MaterialDeliveryPromise.java | 1 + .../estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 16 ++++++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 5 ++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 8 +++ .../i3plus/pojo/aps/holders/EInsertedOrder.java | 5 ++ .../estsh/i3plus/pojo/aps/holders/EInventory.java | 5 ++ .../i3plus/pojo/aps/holders/ESafeStockOrder.java | 5 ++ .../aps/repository/InsertedOrderRepository.java | 9 ++++ .../src/main/resources/relations/InsertedOrder.xml | 5 ++ .../src/main/resources/relations/Inventory.xml | 5 ++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 54 ++++++++++++++++++- 16 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java index 7e24878..6b1e36b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ExcludeImportExport.java @@ -15,4 +15,6 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface ExcludeImportExport { + boolean excludeImport() default true; + boolean excludeExport() default true; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index e87a86a..94994de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -93,6 +94,11 @@ public class BaseOrder extends BaseAPS { @ApiParam(value ="专料号") private String specifyMaterialNum; + @Column(name="VALID_ORDER") + @ApiParam(value ="有效订单") + @FieldAnnotation(modify = false) + private Integer validOrder = CommonEnumUtil.VALID; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 59e4f4a..91d9e6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -61,6 +61,7 @@ public class ImportDetail extends BaseAPS { @Column(name="IN_NAME") @ApiParam(value ="内部表名") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.QUERY_LIST, notEmpty = true) private String inName; @Column(name="PORT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java new file mode 100644 index 0000000..be4c060 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :插单管理 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-03-02 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_INSERTED_ORDER") +@Api("插单管理") +public class InsertedOrder extends BaseOrder { + private static final long serialVersionUID = -5036380772996107234L; + + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "UNCOMMIT") + private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus; + + @Column(name="STAND_OPERATIONS") + @ApiParam("工序") + private String standOperations; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EInsertedOrder.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EInsertedOrder.ProductRouting, routing); + } + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 73f5993..bc0c601 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.EInventory; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -13,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :库存 @@ -66,4 +69,7 @@ public class Inventory extends BaseOrder { public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } + + @JsonBackReference + public List getSafeStockOrders() { return BeanRelation.list(this, EInventory.SafeStockOrders); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index d3febc2..1e7ca3b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -28,6 +28,7 @@ import java.util.Date; @Table(name = "APS_MATERIAL_DELIVERY_PROMISE") @Api("物料交期承诺") public class MaterialDeliveryPromise extends BaseBean { + private static final long serialVersionUID = 831759543772896829L; @Column(name="QTY") @ApiParam(value ="到货数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index 53a7d66..fa8db20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -1,12 +1,16 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -30,4 +34,16 @@ public class SafeStockOrder extends BaseOrder { public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } + + @Column(name="INVENTORY_ID") + @ApiParam(value ="库存") + @FieldAnnotation(relation = "Inventory", notEmpty = true) + private Long inventoryId; + + public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } + + public void setInventory(Inventory inventory) { + this.inventoryId = inventory != null ? inventory.getId() : 0; + BeanRelation.set(this, ESafeStockOrder.Inventory, inventory); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index bd8679a..2989ad5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -56,6 +56,11 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String allowDelayTime; + @Column(name="ORDER_STATUS") + @ApiParam(value ="订单状态") + @FieldAnnotation(defaultValue = "WAITING") + private ApsEnumUtil.SALES_ORDER_STATUS orderStatus; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 8a44e6d..07ef339 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -45,6 +45,14 @@ public abstract class BaseAPS extends BaseBean { customFields.put(code, value); } + public String getCustomString(String code) { + Object value = customFields.get(code); + if (value == null) { + return ""; + } + return value.toString(); + } + public Integer getCustomInteger(String code) { Object value = customFields.get(code); if (value == null) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java new file mode 100644 index 0000000..c8a6248 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInsertedOrder { + ProductRouting +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java new file mode 100644 index 0000000..9c0719a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EInventory { + SafeStockOrders +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java new file mode 100644 index 0000000..bec040c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum ESafeStockOrder { + Inventory +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java new file mode 100644 index 0000000..f68eb71 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/InsertedOrderRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.InsertedOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface InsertedOrderRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml new file mode 100644 index 0000000..19e8ca9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/InsertedOrder.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml new file mode 100644 index 0000000..4fcb3cc --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Inventory.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 279c6b0..4eb8a14 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -999,7 +999,8 @@ public class ApsEnumUtil { STRING("STRING", "字符串，文本框编辑"), OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), - MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"); + MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); private String value; private String description; @@ -1116,4 +1117,55 @@ public class ApsEnumUtil { return description; } } + + /** + * 销售订单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SALES_ORDER_STATUS { + WAITING("WAITING", "待处理"), + CHANGE("CHANGE", "改带"), + COMMIT("COMMIT", "确认"); + + private String value; + private String description; + + SALES_ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 插单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum INSERTED_ORDER_STATUS { + UNCOMMIT("UNCOMMIT", "未提交"), + COMMIT("COMMIT", "提交"); + + private String value; + private String description; + + INSERTED_ORDER_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From faeef7b5117c85de22d95ab3ec45a14fd8a93794 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 10 Mar 2021 09:39:37 +0800 Subject: [PATCH 8/8] =?UTF-8?q?swebplanOrder=E5=A2=9E=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index dcbe79e..4cf4124 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; + @Column(name = "EXP_DATE") + @ApiParam(value = "过期日期") + private String expDate; + + @Column(name = "ITEM") + @ApiParam("行号") + private Integer item; + + @Column(name = "START_DATE") + @ApiParam(value = "起始日期") + private String startDate; }