Merge remote-tracking branch 'origin/master'

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);

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;

src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java

@@ -21,7 +21,7 @@ public interface PtmConditionItemMapper extends BaseMapper<PtmConditionItemData>
     List<PtmConditionItemData> 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<String> searchItemNoByType(PtmConditionItemData data);
 }

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;
     /**
      * 更新人

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;

src/main/resources/mapper/part/BomManagementMapper.xml

@@ -577,7 +577,7 @@
             site = #{query.site}
             and sourceBu = #{query.buNo}
             and active = 'Y'
-            and part_type <![CDATA[<>]]> 'Purchased (raw)'
+<!--            and part_type <![CDATA[<>]]> 'Purchased (raw)' -->
             <if test = "query.partNo != null and query.partNo != ''">
                 AND part_no = #{query.partNo}
             </if>