aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-03 16:59:49 +08:00
parent e5919db7cc
commit 5b4b824460
7 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -431,6 +431,9 @@ public class EmisWaybill extends BaseEntity
// 最后一条跟踪记录
private String lastTraceInfo;
// 问题件类型
private String problemTypeName;
// 最近一条扫描记录

11
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
View File

@ -81,4 +81,15 @@ public class EmisWaybillProblemInfo extends BaseEntity
/* 文件路径 */
private String filePath;
// 扩展 通知网点
private String problemTypeName;
private String sendSiteName;
private String registerManName;
private String registerSiteName;
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -313,8 +313,6 @@ public class WaybillOrder implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date signDate;
/* 当前网点编号 */
private String currentSiteCode;
/* 下一网点编号 */
@ -326,7 +324,7 @@ public class WaybillOrder implements Serializable {
private String lockFlag;
private String problemTypeName;
// 销售,回款
// private String salesmenName;
@ -592,6 +590,8 @@ public class WaybillOrder implements Serializable {
voItem.setLockFlag(dbWaybill.getLockFlag());
voItem.setProblemTypeName(dbWaybill.getProblemTypeName());
return voItem;
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -495,12 +495,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
waybillProblemInfo.setBillCode(emisTmsScanRecord.getBillCode());
waybillProblemInfo.setProblemType(problemType);
waybillProblemInfo.setProblemCause(remark);
waybillProblemInfo.setSendSiteCode(notifySite);
waybillProblemInfo.setRegisterDate(emisTmsScanRecord.getScanDate());
waybillProblemInfo.setRegisterManCode(emisTmsScanRecord.getScanManCode());
waybillProblemInfo.setRegisterSiteCode(emisTmsScanRecord.getScanSiteCode());
waybillProblemInfo.setProblemTitle(remark);
waybillProblemInfo.setFilePath(picUrl);
if(emisTmsScanRecord.getScanSiteCode().equals(notifySite)){
waybillProblemInfo.setIsSendSiteRegister("1");
}
registerWaybillProblemInfo(waybillProblemInfo);
// 更新运单状态为问题件

5
emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
View File

@ -104,5 +104,10 @@
select a.name from emis_brand a where a.code = #{code} limit 1
</select>
<!-- 查询问题件类型原型 -->
<select id="selectProblemTypeNameById" parameterType="long" resultType="string">
select a.type_name from emis_problem_type a where a.id = #{id} limit 1
</select>
</mapper>

1
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -202,6 +202,7 @@
<association property="nextSiteName" column="next_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="lastSiteName" column="last_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="problemTypeName" column="problem_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProblemTypeNameById"/>
</resultMap>

7
emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
View File

@ -28,6 +28,13 @@
<result property="blCheckok" column="bl_checkok" />
<result property="blSee" column="bl_see" />
<result property="filePath" column="file_path" />
<association property="problemTypeName" column="problem_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProblemTypeNameById"/>
<association property="sendSiteName" column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="registerSiteName" column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<association property="registerManName" column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
</resultMap>
<sql id="selectEmisWaybillProblemInfoVo">