From a171b6a82d904dbdca7c6127eda80fcade23c944 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:27:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2024.9.18=20=E4=B8=80=E3=80=81=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?= =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89?= =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/part/data/PartGroupStdOperationsData.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java b/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java index 09d81e7f..8706efce 100644 --- a/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java +++ b/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -81,16 +82,16 @@ public class PartGroupStdOperationsData implements Serializable { private Integer conditionId; @TableField(exist = false) - private Long laborRunFactor; + private BigDecimal laborRunFactor; @TableField(exist = false) - private Long machRunFactor; + private BigDecimal machRunFactor; @TableField(exist = false) - private Long laborCycleTime; + private BigDecimal laborCycleTime; @TableField(exist = false) - private Long machCycleTime; + private BigDecimal machCycleTime; @TableField(exist = false) private Integer partGroupStdOperationsId; From 289423e69897766b98b7e53644008605eded753d Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Thu, 19 Sep 2024 10:53:07 +0800 Subject: [PATCH 2/4] 20240919 --- .../modules/quote/entity/QuotationInformationEntity.java | 8 ++++---- .../java/com/xujie/sys/modules/quote/entity/Quote.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java index 74d569be..1c749898 100644 --- a/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java +++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuotationInformationEntity.java @@ -127,8 +127,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl * 创建时间 **/ @TableField(fill = FieldFill.INSERT) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createDate; /** * 创建人 @@ -138,8 +138,8 @@ public class QuotationInformationEntity extends QueryPage implements Serializabl * 更新时间 **/ @TableField(fill = FieldFill.UPDATE,insertStrategy = FieldStrategy.NEVER) - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateDate; /** * 更新人 diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java index 69dc7b52..025ed8d7 100644 --- a/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java +++ b/src/main/java/com/xujie/sys/modules/quote/entity/Quote.java @@ -76,14 +76,14 @@ public class Quote { private String createBy; - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createDate; private String updateBy; - @JsonFormat(pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateDate; private String remark; From dbbf604c5e3b1ba0b002c8dc78f301e27cb234b1 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Thu, 19 Sep 2024 11:48:58 +0800 Subject: [PATCH 3/4] 20240919 --- src/main/resources/mapper/part/BomManagementMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml index cfc542b8..85b2d774 100644 --- a/src/main/resources/mapper/part/BomManagementMapper.xml +++ b/src/main/resources/mapper/part/BomManagementMapper.xml @@ -577,7 +577,7 @@ site = #{query.site} and sourceBu = #{query.buNo} and active = 'Y' - and part_type ]]> 'Purchased (raw)' + AND part_no = #{query.partNo} From 9471e250a275fbd465e7e764945bb2e501dd4513 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Thu, 19 Sep 2024 11:56:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2024.9.18=20=E4=B8=80=E3=80=81=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?= =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89?= =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E7=89=88=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../part/controller/PartProductGroupInformationController.java | 2 ++ .../xujie/sys/modules/part/mapper/PtmConditionItemMapper.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java index 3bf4bfe0..cb051832 100644 --- a/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java +++ b/src/main/java/com/xujie/sys/modules/part/controller/PartProductGroupInformationController.java @@ -211,6 +211,8 @@ public class PartProductGroupInformationController { ptmConditionItemData.setRecordType(data.getRecordType()); ptmConditionItemData.setCreateBy(data.getCreateBy()); ptmConditionItemData.setCreateDate(data.getCreateDate()); + ptmConditionItemData.setTextValue(null); + ptmConditionItemData.setNumValue(null); ptmConditionItemService.saveProductGroupPtmItem(ptmConditionItemData); try { ptmConditionProcessService.saveProductGroupPtmProcess(data); diff --git a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java index f69cd869..cd6db42b 100644 --- a/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java +++ b/src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java @@ -21,7 +21,7 @@ public interface PtmConditionItemMapper extends BaseMapper List searchProductGroupPtmConditionItem(PtmConditionProcessData data); @Select( - "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType}" + "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType} and site = #{site} and bu_no = #{buNo}" ) List searchItemNoByType(PtmConditionItemData data); }