diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java b/6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java
index 6d98915..2fcbb18 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java
@@ -106,8 +106,7 @@ public class MyGenerator {
@Test
public void generateCodeWithInjectConfigForAllTable() {
- generateByTablesWithInjectConfig(new String[]{"t_curr_task"});
- generateByTablesWithInjectConfig(new String[]{"t_task_his"});
+ generateByTablesWithInjectConfig(new String[]{"t_apms_check_result"});
}
public static void main(String[] args) {
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java
index 5dfd80e..c6bdb54 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java
@@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
*
*
* @author mt
- * @since 2021-11-19
+ * @since 2021-12-29
*/
public interface ApmsCheckResultMapper extends BaseMapper {
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml
index 3d4ef1a..3b2b71d 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml
@@ -16,12 +16,16 @@
+
+
+
+
id, valid, create_time, creator_id, updater_id, update_time, version, sheet_no, iden_card_num, hardness,
- metallography, heart_hardness
+ metallography, heart_hardness, remake, hardness_value_one, hardness_value_two, hardness_value_three
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java
index 415ef28..d9b4a4b 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java
@@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
*
*
* @author mt
- * @since 2021-11-19
+ * @since 2021-12-29
*/
public interface ApmsCheckResultServiceBiz extends IService {
diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ApmsCheckResultServiceBizImpl.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ApmsCheckResultServiceBizImpl.java
index 5773e71..2152858 100644
--- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ApmsCheckResultServiceBizImpl.java
+++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ApmsCheckResultServiceBizImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
*
*
* @author mt
- * @since 2021-11-19
+ * @since 2021-12-29
*/
@Service
public class ApmsCheckResultServiceBizImpl extends ServiceImpl implements ApmsCheckResultServiceBiz {
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
index b280fdb..42f0e8b 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
@@ -69,7 +69,6 @@ public class ApmsController extends BaseController {
@PostMapping(value = "apmsVoidOrder")
@ApiOperation(value = "WMS接收APMS作废订单信息")
public R apmsVoidOrder(@Validated @RequestBody Iden idenCardNum) {
- //todo 改动为json值
CommunicationLog communicationLog = new CommunicationLog();
communicationLog.setCode("APMS" + System.currentTimeMillis());
communicationLog.setLogName("WMS接收APMS作废订单信息");
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ApmsCompleteOrder.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ApmsCompleteOrder.java
index eab0510..8b242d2 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ApmsCompleteOrder.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ApmsCompleteOrder.java
@@ -16,7 +16,7 @@ public class ApmsCompleteOrder extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "生产单编号", required = false)
+ @ApiModelProperty(value = "生产单编号", required = true)
private String sheetNo;
/**
@@ -31,7 +31,17 @@ public class ApmsCompleteOrder extends BaseParam {
@ApiModelProperty(value = "金相检验结果", required = true)
private String metallographic;
- @ApiModelProperty(value = "心部硬度检验值", required = true)
- private Float heartHardness;
+ @ApiModelProperty(value = "心部硬度检验值", required = false)
+ private String heartHardness;
+
+ @ApiModelProperty(value = "硬度检验值1", required = false)
+ private String hardnessValueOne;
+ @ApiModelProperty(value = "硬度检验值2", required = false)
+ private String hardnessValueTwo;
+ @ApiModelProperty(value = "硬度检验值3", required = false)
+ private String hardnessValueThree;
+
+ @ApiModelProperty(value = "备注", required = false)
+ private String remake;
}