From 0b4795e92cab913d0933aa4c2887c5051c60b8c8 Mon Sep 17 00:00:00 2001 From: Lin-XCC <754310653@QQ.COM> Date: Wed, 5 Jan 2022 09:49:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BAapms=E6=A3=80=E9=AA=8C=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/core/dal/entity/ApmsCheckResult.java | 116 +++++++++++++++++- .../dal/mapper/ApmsCheckResultMapper.java | 2 +- .../core/dal/mapper/ApmsCheckResultMapper.xml | 20 ++- .../service/ApmsCheckResultServiceBiz.java | 2 +- .../impl/ApmsCheckResultServiceBizImpl.java | 2 +- .../wms/empty/params/ApmsCompleteOrder.java | 86 +++++++++++++ .../service/impl/OrderInfoServiceImpl.java | 21 +--- .../src/main/resources/config/application.yml | 4 +- 8 files changed, 228 insertions(+), 25 deletions(-) diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java index 5c7be40..0e72168 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; *

* * @author mt - * @since 2021-12-29 + * @since 2022-01-05 */ @Data @EqualsAndHashCode(callSuper = false) @@ -79,7 +79,7 @@ public class ApmsCheckResult extends Model { private String idenCardNum; /** - * 硬度检验结果（合格、不合格、返工、作废） + * 硬度检验结果（待检验、合格、不合格、返工、作废） */ @TableField("hardness") private String hardness; @@ -120,6 +120,90 @@ public class ApmsCheckResult extends Model { @TableField("hardness_value_three") private String hardnessValueThree; + /** + * 金相检验渗碳淬火 渗碳层深度 + */ + @TableField("metallography_stch_stccsd") + private Float metallographyStchStccsd; + + /** + * 金相检验渗碳淬火 表面为马氏体、残余奥氏体（级） + */ + @TableField("metallography_stch_mstost") + private String metallographyStchMstost; + + /** + * 金相检验渗碳淬火 细小颗粒状碳化物 + */ + @TableField("metallography_stch_xxklzthw") + private String metallographyStchXxklzthw; + + /** + * 金相检验渗碳淬火 心部为低碳马氏体加游离铁素体（级） + */ + @TableField("metallography_stch_dtmstyltst") + private String metallographyStchDtmstyltst; + + /** + * 金相检验整体淬火 基体为回火马氏体（级） + */ + @TableField("metallography_ztch_hhmst") + private String metallographyZtchHhmst; + + /** + * 金相检验整体淬火 基体为回火托式体（级） + */ + @TableField("metallography_ztch_hhtst") + private String metallographyZtchHhtst; + + /** + * 金相检验整体淬火 基体为回火素式体（级） + */ + @TableField("metallography_ztch_hhsst") + private String metallographyZtchHhsst; + + /** + * 金相检验氮化 表面亮白色的为氮化合物层深 + */ + @TableField("metallography_dh_dhhwcs") + private Float metallographyDhDhhwcs; + + /** + * 金相检验氮化 向内为扩散层深 + */ + @TableField("metallography_dh_kscs") + private Float metallographyDhKscs; + + /** + * 金相检验氮化 心部 + */ + @TableField("metallography_dh_xb") + private String metallographyDhXb; + + /** + * 金相检验表面淬火 表面为板条马氏体（级） + */ + @TableField("metallography_bmch_btmst") + private String metallographyBmchBtmst; + + /** + * 金相检验表面淬火 心部 + */ + @TableField("metallography_bmch_xb") + private String metallographyBmchXb; + + /** + * 金相检验 备注 + */ + @TableField("metallography_bz") + private String metallographyBz; + + /** + * 金相检验心部硬度 心部硬度检验结果 + */ + @TableField("metallography_xbyd_xbydjyjg") + private Float metallographyXbydXbydjyjg; + public static final String ID = "id"; @@ -153,6 +237,34 @@ public class ApmsCheckResult extends Model { public static final String HARDNESS_VALUE_THREE = "hardness_value_three"; + public static final String METALLOGRAPHY_STCH_STCCSD = "metallography_stch_stccsd"; + + public static final String METALLOGRAPHY_STCH_MSTOST = "metallography_stch_mstost"; + + public static final String METALLOGRAPHY_STCH_XXKLZTHW = "metallography_stch_xxklzthw"; + + public static final String METALLOGRAPHY_STCH_DTMSTYLTST = "metallography_stch_dtmstyltst"; + + public static final String METALLOGRAPHY_ZTCH_HHMST = "metallography_ztch_hhmst"; + + public static final String METALLOGRAPHY_ZTCH_HHTST = "metallography_ztch_hhtst"; + + public static final String METALLOGRAPHY_ZTCH_HHSST = "metallography_ztch_hhsst"; + + public static final String METALLOGRAPHY_DH_DHHWCS = "metallography_dh_dhhwcs"; + + public static final String METALLOGRAPHY_DH_KSCS = "metallography_dh_kscs"; + + public static final String METALLOGRAPHY_DH_XB = "metallography_dh_xb"; + + public static final String METALLOGRAPHY_BMCH_BTMST = "metallography_bmch_btmst"; + + public static final String METALLOGRAPHY_BMCH_XB = "metallography_bmch_xb"; + + public static final String METALLOGRAPHY_BZ = "metallography_bz"; + + public static final String METALLOGRAPHY_XBYD_XBYDJYJG = "metallography_xbyd_xbydjyjg"; + @Override protected Serializable pkVal() { return this.id; 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 c6bdb54..dc8d267 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-12-29 + * @since 2022-01-05 */ 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 3b2b71d..73bd745 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 @@ -20,12 +20,30 @@ + + + + + + + + + + + + + + id, valid, create_time, creator_id, updater_id, update_time, version, sheet_no, iden_card_num, hardness, - metallography, heart_hardness, remake, hardness_value_one, hardness_value_two, hardness_value_three + metallography, heart_hardness, remake, hardness_value_one, hardness_value_two, hardness_value_three, + metallography_stch_stccsd, metallography_stch_mstost, metallography_stch_xxklzthw, + metallography_stch_dtmstyltst, metallography_ztch_hhmst, metallography_ztch_hhtst, metallography_ztch_hhsst, + metallography_dh_dhhwcs, metallography_dh_kscs, metallography_dh_xb, metallography_bmch_btmst, + metallography_bmch_xb, metallography_bz, metallography_xbyd_xbydjyjg 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 d9b4a4b..a548cb4 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-12-29 + * @since 2022-01-05 */ 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 2152858..35cf4e3 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-12-29 + * @since 2022-01-05 */ @Service public class ApmsCheckResultServiceBizImpl extends ServiceImpl implements ApmsCheckResultServiceBiz { 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 8b242d2..3cd1634 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 @@ -41,6 +41,92 @@ public class ApmsCompleteOrder extends BaseParam { @ApiModelProperty(value = "硬度检验值3", required = false) private String hardnessValueThree; + + /** + * 金相检验渗碳淬火 渗碳层深度 + */ + @ApiModelProperty(value = "金相检验渗碳淬火 渗碳层深度") + private Float metallographyStchStccsd; + + /** + * 金相检验渗碳淬火 表面为马氏体、残余奥氏体（级） + */ + @ApiModelProperty(value = "金相检验渗碳淬火 表面为马氏体、残余奥氏体（级）") + private String metallographyStchMstost; + + /** + * 金相检验渗碳淬火 细小颗粒状碳化物 + */ + @ApiModelProperty(value = "金相检验渗碳淬火 细小颗粒状碳化物") + private String metallographyStchXxklzthw; + + /** + * 金相检验渗碳淬火 心部为低碳马氏体加游离铁素体（级） + */ + @ApiModelProperty(value = "金相检验渗碳淬火 心部为低碳马氏体加游离铁素体（级）") + private String metallographyStchDtmstyltst; + + /** + * 金相检验整体淬火 基体为回火马氏体（级） + */ + @ApiModelProperty(value = "金相检验整体淬火 基体为回火马氏体（级）") + private String metallographyZtchHhmst; + + /** + * 金相检验整体淬火 基体为回火托式体（级） + */ + @ApiModelProperty(value = "金相检验整体淬火 基体为回火托式体（级）") + private String metallographyZtchHhtst; + + /** + * 金相检验整体淬火 基体为回火素式体（级） + */ + @ApiModelProperty(value = "金相检验整体淬火 基体为回火素式体（级）") + private String metallographyZtchHhsst; + + /** + * 金相检验氮化 表面亮白色的为氮化合物层深 + */ + @ApiModelProperty(value = "金相检验氮化 表面亮白色的为氮化合物层深") + private Float metallographyDhDhhwcs; + + /** + * 金相检验氮化 向内为扩散层深 + */ + @ApiModelProperty(value = "金相检验氮化 向内为扩散层深") + private Float metallographyDhKscs; + + /** + * 金相检验氮化 心部 + */ + @ApiModelProperty(value = "金相检验氮化 心部") + private String metallographyDhXb; + + /** + * 金相检验表面淬火 表面为板条马氏体（级） + */ + @ApiModelProperty(value = "金相检验表面淬火 表面为板条马氏体（级）") + private String metallographyBmchBtmst; + + /** + * 金相检验表面淬火 心部 + */ + @ApiModelProperty(value = "金相检验表面淬火 心部") + private String metallographyBmchXb; + + /** + * 金相检验 备注 + */ + @ApiModelProperty(value = "金相检验 备注") + private String metallographyBz; + + /** + * 金相检验心部硬度 心部硬度检验结果 + */ + @ApiModelProperty(value = "金相检验心部硬度 心部硬度检验结果") + private Float metallographyXbydXbydjyjg; + + @ApiModelProperty(value = "备注", required = false) private String remake; } diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java index 823c40e..43f4e39 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java @@ -303,18 +303,11 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic { //通过标识卡号与生产单号进行检验结果存储 ApmsCheckResult one = new ApmsCheckResult(); - one.setIdenCardNum(apmsCompleteOrder.getIdenCardNum()); - one.setSheetNo(apmsCompleteOrder.getSheetNo()); + BeanUtils.copyProperties(apmsCompleteOrder, one); one.setCreateTime(LocalDateTime.now()); + one.setUpdateTime(LocalDateTime.now()); one.setValid(WhetherEnum.YES.getValue()); one.setMetallography(apmsCompleteOrder.getMetallographic()); - one.setHeartHardness(apmsCompleteOrder.getHeartHardness()); - one.setHardnessValueOne(apmsCompleteOrder.getHardnessValueOne()); - one.setHardnessValueTwo(apmsCompleteOrder.getHardnessValueTwo()); - one.setHardnessValueThree(apmsCompleteOrder.getHardnessValueThree()); - one.setHardness(apmsCompleteOrder.getHardness()); - one.setUpdateTime(LocalDateTime.now()); - one.setRemake(apmsCompleteOrder.getRemake()); apmsCheckResultServiceBiz.save(one); //订单不应该在该地方完成，额外提供一个完成接口供人工完成，不通知apms return successful("操作成功，接收检验结果完成。", ""); @@ -322,17 +315,9 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic else { //存在检验结果更新的情况。主管或其他人员可能会更改结果。 - one1.setIdenCardNum(apmsCompleteOrder.getIdenCardNum()); - one1.setSheetNo(apmsCompleteOrder.getSheetNo()); - one1.setValid(WhetherEnum.YES.getValue()); + BeanUtils.copyProperties(apmsCompleteOrder, one1); one1.setMetallography(apmsCompleteOrder.getMetallographic()); - one1.setHeartHardness(apmsCompleteOrder.getHeartHardness()); - one1.setHardnessValueOne(apmsCompleteOrder.getHardnessValueOne()); - one1.setHardnessValueTwo(apmsCompleteOrder.getHardnessValueTwo()); - one1.setHardnessValueThree(apmsCompleteOrder.getHardnessValueThree()); - one1.setHardness(apmsCompleteOrder.getHardness()); one1.setUpdateTime(LocalDateTime.now()); - one1.setRemake(apmsCompleteOrder.getRemake()); apmsCheckResultServiceBiz.updateById(one1); return successful("操作成功，更新检验结果完成。", ""); } diff --git a/6.program/wms-gateway/src/main/resources/config/application.yml b/6.program/wms-gateway/src/main/resources/config/application.yml index 9348986..0769217 100644 --- a/6.program/wms-gateway/src/main/resources/config/application.yml +++ b/6.program/wms-gateway/src/main/resources/config/application.yml @@ -88,7 +88,9 @@ wms: - /*/login - /*/wechatLogin - /*/mobileLogin - - /apms + - /apms/apmsCompleteOrder + - /apms/apmsPostOrder + - /apms/apmsVoidOrder #公共配置 common: From 81b9f5c45e191e79f1d35d388580c5347afc3ac9 Mon Sep 17 00:00:00 2001 From: Lin-XCC <754310653@QQ.COM> Date: Fri, 8 Jul 2022 15:43:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java | 2 +- .../main/java/com/mt/wms/empty/controller/ApmsController.java | 1 - .../com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java index 2b529de..7c2e1a5 100644 --- a/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java +++ b/6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/OrderInfo.java @@ -97,7 +97,7 @@ public class OrderInfo extends Model { private String orderNo; /** - * 原订单号，APMS系统获取 返单时才存在 + * 原订单号(对应原先的标识卡号)，APMS系统获取 返单时才存在 */ @TableField("old_order_no") private String oldOrderNo; 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 d63a6a3..a29038e 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 @@ -47,7 +47,6 @@ public class ApmsController extends BaseController { @Autowired private CommunicationLogServiceBiz communicationLogServiceBiz; - // static String Token = "eyJhbGciOiJIUzI1NiJ9.eyJkYXRlIjozMTkyNzU4NDk4ODA3LCJwbGF0Rm9ybUlkIjoyLCJhcGlLZXkiOiI3ZWU4ZjU5YmJhZWFlMjdlIiwiZXhwIjozMTkyNzU4NDk4LCJpYXQiOjE2Mzc1NTg0OTh9.RH3MRQr1dCBYW996-WXN69eXu1ZFblAQHfhZHNbTmCg"; static String Token = ""; static LocalDateTime TokenExpireTime = LocalDateTime.now(); static String ApiAddress = "http://59.110.171.25:9010"; diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java index 43f4e39..b08180d 100644 --- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java +++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java @@ -216,7 +216,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic // 考虑返工单的加工情况，添加到返工统计信息中。 if (Objects.nonNull(one.getOldOrderNo())) { - List list = orderInfoService.list(new QueryWrapper().eq(OrderInfo.VALID, 1).eq(OrderInfo.ORDER_NO, one.getOldOrderNo())); + List list = orderInfoService.list(new QueryWrapper().eq(OrderInfo.VALID, 1).eq(OrderInfo.IDEN_CARD_NUM, one.getOldOrderNo())); float reQuantity = 0; float reWeight = 0; for (OrderInfo orderInfo : list)