mt-ck/mt-qj-wms-hd
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化apms对接时发现的问题。

Browse Source
This commit is contained in:
徐晨晨 2021-12-30 10:13:30 +08:00
parent 0a34af7c00
commit 2ce5380397
7 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
6.program/wms-core/src/main/java/com/mt/wms/core/MyGenerator.java
View File

@ -106,8 +106,7 @@ public class MyGenerator {
@Test @Test
public void generateCodeWithInjectConfigForAllTable() { public void generateCodeWithInjectConfigForAllTable() {
generateByTablesWithInjectConfig(new String[]{"t_curr_task"}); generateByTablesWithInjectConfig(new String[]{"t_apms_check_result"});
generateByTablesWithInjectConfig(new String[]{"t_task_his"});
} }
public static void main(String[] args) { public static void main(String[] args) {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.java
View File

@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
* </p> * </p>
* *
* @author mt * @author mt
* @since 2021-11-19 * @since 2021-12-29
*/ */
public interface ApmsCheckResultMapper extends BaseMapper<ApmsCheckResult> { public interface ApmsCheckResultMapper extends BaseMapper<ApmsCheckResult> {

6
6.program/wms-core/src/main/java/com/mt/wms/core/dal/mapper/ApmsCheckResultMapper.xml
View File

@ -16,12 +16,16 @@
<result column="hardness" property="hardness"/> <result column="hardness" property="hardness"/>
<result column="metallography" property="metallography"/> <result column="metallography" property="metallography"/>
<result column="heart_hardness" property="heartHardness"/> <result column="heart_hardness" property="heartHardness"/>
<result column="remake" property="remake"/>
<result column="hardness_value_one" property="hardnessValueOne"/>
<result column="hardness_value_two" property="hardnessValueTwo"/>
<result column="hardness_value_three" property="hardnessValueThree"/>
</resultMap> </resultMap>
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, valid, create_time, creator_id, updater_id, update_time, version, sheet_no, iden_card_num, hardness, 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
</sql> </sql>
</mapper> </mapper>

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/ApmsCheckResultServiceBiz.java
View File

@ -9,7 +9,7 @@ import com.mt.wms.core.dal.entity.ApmsCheckResult;
* </p> * </p>
* *
* @author mt * @author mt
* @since 2021-11-19 * @since 2021-12-29
*/ */
public interface ApmsCheckResultServiceBiz extends IService<ApmsCheckResult> { public interface ApmsCheckResultServiceBiz extends IService<ApmsCheckResult> {

2
6.program/wms-core/src/main/java/com/mt/wms/core/dal/service/impl/ApmsCheckResultServiceBizImpl.java
View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p> * </p>
* *
* @author mt * @author mt
* @since 2021-11-19 * @since 2021-12-29
*/ */
@Service @Service
public class ApmsCheckResultServiceBizImpl extends ServiceImpl<ApmsCheckResultMapper, ApmsCheckResult> implements ApmsCheckResultServiceBiz { public class ApmsCheckResultServiceBizImpl extends ServiceImpl<ApmsCheckResultMapper, ApmsCheckResult> implements ApmsCheckResultServiceBiz {

1
6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ApmsController.java
View File

@ -69,7 +69,6 @@ public class ApmsController extends BaseController {
@PostMapping(value = "apmsVoidOrder") @PostMapping(value = "apmsVoidOrder")
@ApiOperation(value = "WMS接收APMS作废订单信息") @ApiOperation(value = "WMS接收APMS作废订单信息")
public R<String> apmsVoidOrder(@Validated @RequestBody Iden idenCardNum) { public R<String> apmsVoidOrder(@Validated @RequestBody Iden idenCardNum) {
//todo 改动为json值
CommunicationLog communicationLog = new CommunicationLog(); CommunicationLog communicationLog = new CommunicationLog();
communicationLog.setCode("APMS" + System.currentTimeMillis()); communicationLog.setCode("APMS" + System.currentTimeMillis());
communicationLog.setLogName("WMS接收APMS作废订单信息"); communicationLog.setLogName("WMS接收APMS作废订单信息");

16
6.program/wms-empty/src/main/java/com/mt/wms/empty/params/ApmsCompleteOrder.java
View File

@ -16,7 +16,7 @@ public class ApmsCompleteOrder extends BaseParam {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "生产单编号", required = false) @ApiModelProperty(value = "生产单编号", required = true)
private String sheetNo; private String sheetNo;
/** /**
@ -31,7 +31,17 @@ public class ApmsCompleteOrder extends BaseParam {
@ApiModelProperty(value = "金相检验结果", required = true) @ApiModelProperty(value = "金相检验结果", required = true)
private String metallographic; private String metallographic;
@ApiModelProperty(value = "心部硬度检验值", required = true) @ApiModelProperty(value = "心部硬度检验值", required = false)
private Float heartHardness; 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;
} }