Merge remote-tracking branch 'origin/master'

srm-module-code/src/main/java/org/jeecg/modules/baseCode/controller/BaseProductClassController.java

@@ -191,7 +191,7 @@ public class BaseProductClassController extends JeecgController<BaseProductClass
     public Result<List<BaseProductClass>> queryByParentId(@RequestParam(name = "id", required = true) String id) {
 
         QueryWrapper<BaseProductClass> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("parentId", id);
+        queryWrapper.eq("parent_id", id);
         queryWrapper.eq("del_flag", "0");
 
         List<BaseProductClass> list = baseProductClassService.list(queryWrapper);

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurDeliveryNoteAlert.java

@@ -30,43 +30,43 @@ public class PurDeliveryNoteAlert implements Serializable {
     private String childId;
     private String purchasemanName;
     private String purchaseDepartmentName;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//	/**创建人*/
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
 
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
-    @ApiModelProperty(value = "状态(1-启用,0-停用)")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
-    @ApiModelProperty(value = "提交(submit)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
-    @ApiModelProperty(value = "关闭(close)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**状态(1-启用,0-停用)*/
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//    @ApiModelProperty(value = "状态(1-启用,0-停用)")
+//    private Integer status;
+//	/**提交(submit)1是0否*/
+//	@Excel(name = "提交(submit)1是0否", width = 15)
+//    @ApiModelProperty(value = "提交(submit)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
+//	/**关闭(close)1是0否*/
+//	@Excel(name = "关闭(close)1是0否", width = 15)
+//    @ApiModelProperty(value = "关闭(close)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String close;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
 	/**到货日期(arrival date)*/
 	@Excel(name = "到货日期(arrival date)", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurInquiryFormAlert.java

@@ -17,21 +17,21 @@ public class PurInquiryFormAlert {
     private String headId;
     private String childId;
 
-    /**状态(1-结束,0-询价中)*/
-    @Excel(name = "状态(1-结束,0-询价中)", width = 15)
-    @ApiModelProperty(value = "状态(1-结束,0-询价中)")
-    @Dict(dicCode = "purchase_inquiry_status")
-    private Integer status;
-    /**删除状态(0-正常,1-已删除)*/
-    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
-    /**提交(1是 0否)*/
-    @Excel(name = "提交(1是 0否)", width = 15)
-    @ApiModelProperty(value = "提交(1是 0否)")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
+//    /**状态(1-结束,0-询价中)*/
+//    @Excel(name = "状态(1-结束,0-询价中)", width = 15)
+//    @ApiModelProperty(value = "状态(1-结束,0-询价中)")
+//    @Dict(dicCode = "purchase_inquiry_status")
+//    private Integer status;
+//    /**删除状态(0-正常,1-已删除)*/
+//    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
+//    /**提交(1是 0否)*/
+//    @Excel(name = "提交(1是 0否)", width = 15)
+//    @ApiModelProperty(value = "提交(1是 0否)")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
     /**单据日期(bill date)*/
     @Excel(name = "单据日期(bill date)", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java

@@ -30,9 +30,9 @@ public class PurOrderAlert implements Serializable {
     private String childId;
     private String purchaseDepartmentName;
     private String purchasemanName;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//	/**创建人*/
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
     //组织  上海/香港
     private String organize;
@@ -44,39 +44,39 @@ public class PurOrderAlert implements Serializable {
     private BigDecimal totalAmountUsed;
 
 
-    /**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**客户确认(1-已确认,0-未确认)*/
-	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
-    @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    @Dict(dicCode = "customer_confirm")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
-    @ApiModelProperty(value = "提交(submit)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
-    @ApiModelProperty(value = "关闭(close)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
+//    /**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**客户确认(1-已确认,0-未确认)*/
+//	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
+//    @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
+//    @Dict(dicCode = "customer_confirm")
+//    private Integer status;
+//	/**提交(submit)1是0否*/
+//	@Excel(name = "提交(submit)1是0否", width = 15)
+//    @ApiModelProperty(value = "提交(submit)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
+//	/**关闭(close)1是0否*/
+//	@Excel(name = "关闭(close)1是0否", width = 15)
+//    @ApiModelProperty(value = "关闭(close)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String close;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
 	/**单据日期*/
 	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurQuotationSelectionAlert.java

@@ -33,32 +33,32 @@ public class PurQuotationSelectionAlert implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String id;
 	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
-
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
-	/**提交(1是 0否)*/
-	@Excel(name = "提交(1是 0否)", width = 15)
-    @ApiModelProperty(value = "提交(1是 0否)")
-    private String submit;
+//
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
+//	/**提交(1是 0否)*/
+//	@Excel(name = "提交(1是 0否)", width = 15)
+//    @ApiModelProperty(value = "提交(1是 0否)")
+//    private String submit;
 	/**单据日期(bill date)*/
 	@Excel(name = "单据日期(bill date)", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/SupplierQuotationDetails.java

@@ -19,8 +19,8 @@ public class SupplierQuotationDetails {
     private String headId;
     private String childId;
     /**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
 
     /**创建时间*/

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java

@@ -186,6 +186,13 @@ public class SaleOrderController {
         BeanUtils.copyProperties(saleOrderPage, saleOrder);
 
         String code = saleOrder.getBillCode();
+        String getSourceCode = saleOrder.getSourceCode();
+        String getSourceCode2 = saleOrder.getSourceCode2();
+
+        if(StringUtils.isBlank(getSourceCode) && StringUtils.isBlank(getSourceCode2)){
+            return Result.error("网络异常，请刷新后重试 ！");
+        }
+
         if (StringUtils.isNotBlank(code)) {
 
             QueryWrapper<SaleOrder> queryWrapper = new QueryWrapper();

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java

@@ -182,6 +182,12 @@ public class SaleQuotationController {
         SaleQuotation saleQuotation = new SaleQuotation();
         BeanUtils.copyProperties(saleQuotationPage, saleQuotation);
 
+        String getSourceCode = saleQuotation.getSourceCode();
+
+        if(StringUtils.isBlank(getSourceCode)){
+            return Result.error("网络异常，请刷新后重试 ！");
+        }
+
         String code = saleQuotation.getBillCode();
         if (StringUtils.isNotBlank(code)) {
 

srm-module-code/src/main/java/org/jeecg/modules/saleCode/service/impl/SaleQuotationServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Collection;
 
@@ -68,6 +69,7 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
 				//外键设置
 				entity.setId(null);
 				entity.setHeadId(saleQuotation.getId());
+
 				saleQuotationShipMapper.insert(entity);
 			}
 		}

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleContractAlert.java

@@ -33,32 +33,32 @@ public class SaleContractAlert {
 
 	private String headId;
 	private String childId;
-	/**创建人*/
-	@ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "创建时间")
-	private Date createTime;
-	/**更新人*/
-	@ApiModelProperty(value = "更新人")
-	private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "更新时间")
-	private Date updateTime;
-	/**状态(1-已提交,0-未提交)*/
-	@Excel(name = "状态(1-已提交,0-未提交)", width = 15)
-	@ApiModelProperty(value = "状态(1-已提交,0-未提交)")
-	@Dict(dicCode = "yes_or_no")
-	private Integer status;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-	@TableLogic
-	private Integer delFlag;
+//	/**创建人*/
+//	@ApiModelProperty(value = "创建人")
+//	private String createBy;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//	@ApiModelProperty(value = "创建时间")
+//	private Date createTime;
+//	/**更新人*/
+//	@ApiModelProperty(value = "更新人")
+//	private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//	@ApiModelProperty(value = "更新时间")
+//	private Date updateTime;
+//	/**状态(1-已提交,0-未提交)*/
+//	@Excel(name = "状态(1-已提交,0-未提交)", width = 15)
+//	@ApiModelProperty(value = "状态(1-已提交,0-未提交)")
+//	@Dict(dicCode = "yes_or_no")
+//	private Integer status;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//	@TableLogic
+//	private Integer delFlag;
 	/**单据日期*/
 	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleDeliveryAlert.java

@@ -28,39 +28,39 @@ public class SaleDeliveryAlert implements Serializable {
 
     private String headId;
     private String childId;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//	/**创建人*/
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
 
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
-    @ApiModelProperty(value = "提交(submit)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
-    @ApiModelProperty(value = "关闭(close)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**提交(submit)1是0否*/
+//	@Excel(name = "提交(submit)1是0否", width = 15)
+//    @ApiModelProperty(value = "提交(submit)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
+//	/**关闭(close)1是0否*/
+//	@Excel(name = "关闭(close)1是0否", width = 15)
+//    @ApiModelProperty(value = "关闭(close)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String close;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
 	/**发货日期*/
 	@Excel(name = "发货日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleOrderAlert.java

@@ -30,47 +30,47 @@ public class SaleOrderAlert implements Serializable {
     private String headId;
     private String childId;
 	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
     //组织  上海/香港
     private String organize;
     //协议条款
     private String agreementTerms;
 
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**客户确认(1-已确认,0-未确认)*/
-	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
-    @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
-    @Dict(dicCode = "customer_confirm")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
-    @ApiModelProperty(value = "提交(submit)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
-	/**关闭(close)1是0否*/
-	@Excel(name = "关闭(close)1是0否", width = 15)
-    @ApiModelProperty(value = "关闭(close)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String close;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**客户确认(1-已确认,0-未确认)*/
+//	@Excel(name = "客户确认(1-已确认,0-未确认)", width = 15)
+//    @ApiModelProperty(value = "客户确认(1-已确认,0-未确认)")
+//    @Dict(dicCode = "customer_confirm")
+//    private Integer status;
+//	/**提交(submit)1是0否*/
+//	@Excel(name = "提交(submit)1是0否", width = 15)
+//    @ApiModelProperty(value = "提交(submit)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
+//	/**关闭(close)1是0否*/
+//	@Excel(name = "关闭(close)1是0否", width = 15)
+//    @ApiModelProperty(value = "关闭(close)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String close;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
 	/**单据日期*/
 	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/saleCode/vo/SaleQuotationAlert.java

@@ -30,33 +30,33 @@ public class SaleQuotationAlert {
 	@ApiModelProperty(value = "主键id")
     private String id;
 	/**创建人*/
-	@ApiModelProperty(value = "创建人")
-    private String createBy;
+//	@ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
 	//协议条款
 	private String agreementTerms;
 
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-	@ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**状态(1-已确认,0-未确认)*/
-	@Excel(name = "状态(1-已确认,0-未确认)", width = 15)
-	@ApiModelProperty(value = "状态(1-已确认,0-未确认)")
-    private Integer status;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    private Integer delFlag;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//	@ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//	@ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//	@ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**状态(1-已确认,0-未确认)*/
+//	@Excel(name = "状态(1-已确认,0-未确认)", width = 15)
+//	@ApiModelProperty(value = "状态(1-已确认,0-未确认)")
+//    private Integer status;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    private Integer delFlag;
 	/**单据日期*/
 	@Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

srm-module-code/src/main/java/org/jeecg/modules/storeCode/vo/StorePurchaseInAlert.java

@@ -30,37 +30,37 @@ public class StorePurchaseInAlert implements Serializable {
     private String headId;
     private String childId;
 	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
+//    @ApiModelProperty(value = "创建人")
+//    private String createBy;
     private String sysOrgCode;
 
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
-    @ApiModelProperty(value = "状态(1-启用,0-停用)")
-    private Integer status;
-	/**提交(submit)1是0否*/
-	@Excel(name = "提交(submit)1是0否", width = 15)
-    @ApiModelProperty(value = "提交(submit)1是0否")
-    @Dict(dicCode = "yes_or_no")
-    private String submit;
-	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
-    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
+//	/**创建时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "创建时间")
+//    private Date createTime;
+//	/**更新人*/
+//    @ApiModelProperty(value = "更新人")
+//    private String updateBy;
+//	/**更新时间*/
+//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @ApiModelProperty(value = "更新时间")
+//    private Date updateTime;
+//	/**状态(1-启用,0-停用)*/
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//    @ApiModelProperty(value = "状态(1-启用,0-停用)")
+//    private Integer status;
+//	/**提交(submit)1是0否*/
+//	@Excel(name = "提交(submit)1是0否", width = 15)
+//    @ApiModelProperty(value = "提交(submit)1是0否")
+//    @Dict(dicCode = "yes_or_no")
+//    private String submit;
+//	/**删除状态(0-正常,1-已删除)*/
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+//    @TableLogic
+//    private Integer delFlag;
 	/**单据日期*/
 	@Excel(name = "单据日期", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")