kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kelvin:94f3f6b9ab84e2874ec20a0012ca13b394ad4be7
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta
..
compare: kelvin:437848ffbe82a549ff7cd645dd8ab928f9c198dd
Branches Tags
kelvin:master
kelvin:1.2.0_241127_beta

No commits in common. "94f3f6b9ab84e2874ec20a0012ca13b394ad4be7" and "437848ffbe82a549ff7cd645dd8ab928f9c198dd" have entirely different histories.
94f3f6b9ab ... 437848ffbe

5 changed files with 8 additions and 31 deletions
Show Stats Expand all files Collapse all files

3
ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
View File

@ -905,8 +905,7 @@ public class BaseKnifeController extends BaseController {
wmsInPlanTemp.setCellCode(zdTask.getAttr3());
wmsInPlanTemp.setPlanCode(zdTask.getAttr4() == null ? zdTask.getCode() : zdTask.getAttr4());
wmsInPlanTemp.setRelBillCode("组装单据");
wmsInPlanTemp.setPlanTypeId(13L);
wmsInPlanTemp.setPlanTypeCode("ZDRK");
wmsInPlanTemp.setPlanTypeId("13");
wmsInPlanTemp.setCreateBy(getUsername());
wmsInPlanTemp.setCreateTime(DateUtils.getNowDate());

22
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmsInPlan.java
View File

@ -150,13 +150,8 @@ public class WmsInPlan extends BaseEntity {
/**
* 入库类型
*/
@Excel(name = "入库类型ID")
private Long planTypeId;
/**
* 入库类型编码
*/
private String planTypeCode;
@Excel(name = "入库类型")
private String planTypeId;
/**
* 入库计划明细信息
@ -339,22 +334,14 @@ public class WmsInPlan extends BaseEntity {
return planCode;
}
public void setPlanTypeId(Long planTypeId) {
public void setPlanTypeId(String planTypeId) {
this.planTypeId = planTypeId;
}
public Long getPlanTypeId() {
public String getPlanTypeId() {
return planTypeId;
}
public String getPlanTypeCode() {
return planTypeCode;
}
public void setPlanTypeCode(String planTypeCode) {
this.planTypeCode = planTypeCode;
}
public List<WmsInPlanDetails> getWmsInPlanDetailsList() {
return wmsInPlanDetailsList;
}
@ -394,7 +381,6 @@ public class WmsInPlan extends BaseEntity {
.append("isDelete", getIsDelete())
.append("planCode", getPlanCode())
.append("planTypeId", getPlanTypeId())
.append("planTypeCode", getPlanTypeCode())
.append("wmsInPlanDetailsList", getWmsInPlanDetailsList())
.toString();
}

2
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsInPlanDetailEntityServiceImpl.java
View File

@ -68,7 +68,7 @@ public class WmsInPlanDetailEntityServiceImpl implements IWmsInPlanDetailEntityS
// 获取入库计划信息
WmsInPlan wmsInPlan = wmsInPlanMapper.selectWmsInPlanByPlanId(entity.getPlanId().toString());
// 获取入库计划
WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsInPlan.getPlanTypeId().toString());
WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(wmsInPlan.getPlanTypeId());
for (WmsInPlanDetails detail : wmsInPlan.getWmsInPlanDetailsList()) {
// 匹配入库明细

2
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java
View File

@ -386,7 +386,7 @@ public class WmsZdTaskServiceImpl implements IWmsZdTaskService
wmsInPlanTemp.setCellCode(wmStorageArea.getAreaCode());
wmsInPlanTemp.setPlanCode(zdTask.getPlanSheet() != null ? zdTask.getPlanSheet() : zdTask.getCode());
wmsInPlanTemp.setRelBillCode("组装单据");
wmsInPlanTemp.setPlanTypeId(13L);
wmsInPlanTemp.setPlanTypeId("13");
wmsInPlanTemp.setCreateBy(getUsername());
wmsInPlanTemp.setCreateTime(DateUtils.getNowDate());

8
ktg-mes/src/main/resources/mapper/wm/WmsInPlanMapper.xml
View File

@ -33,7 +33,6 @@
<result property="isDelete" column="IS_DELETE"/>
<result property="planCode" column="PLAN_CODE"/>
<result property="planTypeId" column="PLAN_TYPE_ID"/>
<result property="planTypeCode" column="PLAN_TYPE_CODE"/>
</resultMap>
<resultMap id="WmsInPlanWmsInPlanDetailsResult" type="WmsInPlan" extends="WmsInPlanResult">
@ -106,7 +105,6 @@
IS_DELETE,
PLAN_CODE,
PLAN_TYPE_ID
PLAN_TYPE_CODE
from WMS_IN_PLAN
</sql>
@ -142,7 +140,6 @@
<if test="isDelete != null and isDelete != ''">and IS_DELETE = #{isDelete}</if>
<if test="planCode != null and planCode != ''">and PLAN_CODE = #{planCode}</if>
<if test="planTypeId != null and planTypeId != ''">and PLAN_TYPE_ID = #{planTypeId}</if>
<if test="planTypeCode != null and planTypeCode != ''">and PLAN_TYPE_CODE = #{planTypeCode}</if>
</where>
order by CREATE_TIME desc
</select>
@ -176,7 +173,6 @@
a.IS_DELETE,
a.PLAN_CODE,
a.PLAN_TYPE_ID,
a.PLAN_TYPE_CODE,
b.DETAILS_ID as sub_DETAILS_ID,
b.PLAN_ID as sub_PLAN_ID,
b.MATERIAL_ID as sub_MATERIAL_ID,
@ -226,7 +222,6 @@
a.IS_DELETE,
a.PLAN_CODE,
a.PLAN_TYPE_ID,
a.PLAN_TYPE_CODE,
b.DETAILS_ID as sub_DETAILS_ID,
b.PLAN_ID as sub_PLAN_ID,
b.MATERIAL_ID as sub_MATERIAL_ID,
@ -277,7 +272,6 @@
<if test="isDelete != null">IS_DELETE,</if>
<if test="planCode != null">PLAN_CODE,</if>
<if test="planTypeId != null">PLAN_TYPE_ID,</if>
<if test="planTypeCode != null">PLAN_TYPE_CODE,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="state != null">#{state},</if>
@ -307,7 +301,6 @@
<if test="isDelete != null">#{isDelete},</if>
<if test="planCode != null">#{planCode},</if>
<if test="planTypeId != null">#{planTypeId},</if>
<if test="planTypeCode != null">#{planTypeCode},</if>
</trim>
</insert>
@ -341,7 +334,6 @@
<if test="isDelete != null">IS_DELETE = #{isDelete},</if>
<if test="planCode != null">PLAN_CODE = #{planCode},</if>
<if test="planTypeId != null">PLAN_TYPE_ID = #{planTypeId},</if>
<if test="planTypeCode != null">PLAN_TYPE_CODE = #{planTypeCode},</if>
</trim>
where PLAN_ID = #{planId}
</update>