diff --git a/doc/售前资料/苦糖果MES系统产品介绍（A4横板）.pptx b/doc/售前资料/苦糖果MES系统产品介绍（A4横板）.pptx
index d6e79d3..ef4ccea 100644
Binary files a/doc/售前资料/苦糖果MES系统产品介绍（A4横板）.pptx and b/doc/售前资料/苦糖果MES系统产品介绍（A4横板）.pptx differ
diff --git a/doc/开发进度/进度甘特图.xlsx b/doc/开发进度/进度甘特图.xlsx
index 96ffce4..1b496bd 100644
Binary files a/doc/开发进度/进度甘特图.xlsx and b/doc/开发进度/进度甘特图.xlsx differ
diff --git a/doc/设计文档/原型设计/原型/APP.rp b/doc/设计文档/原型设计/原型/APP.rp
index 58b1659..3f5297b 100644
Binary files a/doc/设计文档/原型设计/原型/APP.rp and b/doc/设计文档/原型设计/原型/APP.rp differ
diff --git a/doc/设计文档/原型设计/截图/触控屏-登录页面.png b/doc/设计文档/原型设计/截图/触控屏-登录页面.png
index 9d14b41..ce59e8b 100644
Binary files a/doc/设计文档/原型设计/截图/触控屏-登录页面.png and b/doc/设计文档/原型设计/截图/触控屏-登录页面.png differ
diff --git a/doc/设计文档/数据库设计/数据库设计.xlsx b/doc/设计文档/数据库设计/数据库设计.xlsx
index 9fcd1bf..2918bb4 100644
Binary files a/doc/设计文档/数据库设计/数据库设计.xlsx and b/doc/设计文档/数据库设计/数据库设计.xlsx differ
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
index 055ef1b..4d7be77 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
@@ -57,6 +57,10 @@ public class ProWorkorder extends TreeEntity
@Excel(name = "单位")
private String unitOfMeasure;
+ /** 批次号 */
+ @Excel(name = "批次号")
+ private String batchCode;
+
/** 生产数量 */
@Excel(name = "生产数量")
private BigDecimal quantity;
@@ -264,7 +268,15 @@ public class ProWorkorder extends TreeEntity
this.requestDate = requestDate;
}
- public Date getRequestDate()
+ public String getBatchCode() {
+ return batchCode;
+ }
+
+ public void setBatchCode(String batchCode) {
+ this.batchCode = batchCode;
+ }
+
+ public Date getRequestDate()
{
return requestDate;
}
@@ -314,39 +326,34 @@ public class ProWorkorder extends TreeEntity
return attr4;
}
+
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("workorderId", getWorkorderId())
- .append("workorderCode", getWorkorderCode())
- .append("workorderName", getWorkorderName())
- .append("orderSource", getOrderSource())
- .append("sourceCode", getSourceCode())
- .append("productId", getProductId())
- .append("productCode", getProductCode())
- .append("productName", getProductName())
- .append("productSpc", getProductSpc())
- .append("unitOfMeasure", getUnitOfMeasure())
- .append("quantity", getQuantity())
- .append("quantityProduced", getQuantityProduced())
- .append("quantityChanged", getQuantityChanged())
- .append("quantityScheduled", getQuantityScheduled())
- .append("clientId", getClientId())
- .append("clientCode", getClientCode())
- .append("clientName", getClientName())
- .append("requestDate", getRequestDate())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("status", getStatus())
- .append("remark", getRemark())
- .append("attr1", getAttr1())
- .append("attr2", getAttr2())
- .append("attr3", getAttr3())
- .append("attr4", getAttr4())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return "ProWorkorder{" +
+ "workorderId=" + workorderId +
+ ", workorderCode='" + workorderCode + '\'' +
+ ", workorderName='" + workorderName + '\'' +
+ ", orderSource='" + orderSource + '\'' +
+ ", sourceCode='" + sourceCode + '\'' +
+ ", productId=" + productId +
+ ", productCode='" + productCode + '\'' +
+ ", productName='" + productName + '\'' +
+ ", productSpc='" + productSpc + '\'' +
+ ", unitOfMeasure='" + unitOfMeasure + '\'' +
+ ", batchCode='" + batchCode + '\'' +
+ ", quantity=" + quantity +
+ ", quantityProduced=" + quantityProduced +
+ ", quantityChanged=" + quantityChanged +
+ ", quantityScheduled=" + quantityScheduled +
+ ", clientId=" + clientId +
+ ", clientCode='" + clientCode + '\'' +
+ ", clientName='" + clientName + '\'' +
+ ", requestDate=" + requestDate +
+ ", status='" + status + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobResult.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobResult.java
new file mode 100644
index 0000000..37956e9
--- /dev/null
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcMobResult.java
@@ -0,0 +1,7 @@
+package com.ktg.mes.qc.domain;
+
+import com.ktg.common.core.domain.BaseEntity;
+
+public class QcMobResult extends BaseEntity {
+
+}
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
index 63f611d..75c4032 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select workorder_id, workorder_code, workorder_name, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure, quantity, client_id, client_code, client_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
+ select workorder_id, workorder_code, workorder_name, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity, client_id, client_code, client_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
-