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

Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

Browse Source
This commit is contained in:
lgh 2022-07-08 15:58:33 +08:00
commit 722ecf61c0
9 changed files with 227 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
6.program/wms-core/src/main/java/com/mt/wms/core/dal/entity/ApmsCheckResult.java
View File

@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* </p>
*
* @author mt
* @since 2021-12-29
* @since 2022-01-05
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ -79,7 +79,7 @@ public class ApmsCheckResult extends Model<ApmsCheckResult> {
private String idenCardNum;
/**
* 硬度检验结果（合格、不合格、返工、作废）
* 硬度检验结果（待检验、合格、不合格、返工、作废）
*/
@TableField("hardness")
private String hardness;
@ -120,6 +120,90 @@ public class ApmsCheckResult extends Model<ApmsCheckResult> {
@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<ApmsCheckResult> {
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;

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

@ -97,7 +97,7 @@ public class OrderInfo extends Model<OrderInfo> {
private String orderNo;
/**
* 原订单号，APMS系统获取 返单时才存在
* 原订单号(对应原先的标识卡号)，APMS系统获取 返单时才存在
*/
@TableField("old_order_no")
private String oldOrderNo;

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>
*
* @author mt
* @since 2021-12-29
* @since 2022-01-05
*/
public interface ApmsCheckResultMapper extends BaseMapper<ApmsCheckResult> {

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

@ -20,12 +20,30 @@
<result column="hardness_value_one" property="hardnessValueOne"/>
<result column="hardness_value_two" property="hardnessValueTwo"/>
<result column="hardness_value_three" property="hardnessValueThree"/>
<result column="metallography_stch_stccsd" property="metallographyStchStccsd"/>
<result column="metallography_stch_mstost" property="metallographyStchMstost"/>
<result column="metallography_stch_xxklzthw" property="metallographyStchXxklzthw"/>
<result column="metallography_stch_dtmstyltst" property="metallographyStchDtmstyltst"/>
<result column="metallography_ztch_hhmst" property="metallographyZtchHhmst"/>
<result column="metallography_ztch_hhtst" property="metallographyZtchHhtst"/>
<result column="metallography_ztch_hhsst" property="metallographyZtchHhsst"/>
<result column="metallography_dh_dhhwcs" property="metallographyDhDhhwcs"/>
<result column="metallography_dh_kscs" property="metallographyDhKscs"/>
<result column="metallography_dh_xb" property="metallographyDhXb"/>
<result column="metallography_bmch_btmst" property="metallographyBmchBtmst"/>
<result column="metallography_bmch_xb" property="metallographyBmchXb"/>
<result column="metallography_bz" property="metallographyBz"/>
<result column="metallography_xbyd_xbydjyjg" property="metallographyXbydXbydjyjg"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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
</sql>
</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>
*
* @author mt
* @since 2021-12-29
* @since 2022-01-05
*/
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>
*
* @author mt
* @since 2021-12-29
* @since 2022-01-05
*/
@Service
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

@ -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://192.168.1.109:80";

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

@ -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;
}

23
6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java
View File

@ -217,7 +217,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
// 考虑返工单的加工情况，添加到返工统计信息中。
if (Objects.nonNull(one.getOldOrderNo()))
{
List<OrderInfo> list = orderInfoService.list(new QueryWrapper<OrderInfo>().eq(OrderInfo.VALID, 1).eq(OrderInfo.ORDER_NO, one.getOldOrderNo()));
List<OrderInfo> list = orderInfoService.list(new QueryWrapper<OrderInfo>().eq(OrderInfo.VALID, 1).eq(OrderInfo.IDEN_CARD_NUM, one.getOldOrderNo()));
float reQuantity = 0;
float reWeight = 0;
for (OrderInfo orderInfo : list)
@ -304,18 +304,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("操作成功，接收检验结果完成。", "");
@ -323,17 +316,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("操作成功，更新检验结果完成。", "");
}