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

demand: 对接外部下单接口订单号逻辑修改

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-06-10 14:43:42 +08:00
parent 3a4e632557
commit 04bd49b254
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -288,4 +288,12 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
* @return 运单列表 * @return 运单列表
*/ */
List<EmisWaybill> selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize); List<EmisWaybill> selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize);
/**
* 根据客户单号查运单
*
* @param custOrderId
* @return
*/
EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
} }

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
View File

@ -48,6 +48,15 @@ public interface IEmisWaybillService extends IDataAuditService
public EmisWaybill selectEmisWaybillByOrderSn(String orderSn); public EmisWaybill selectEmisWaybillByOrderSn(String orderSn);
/**
* 根据客户订单号查询
*
* @param custOrderId
* @return
*/
public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
/** /**
* 查询运单列表列表 * 查询运单列表列表

11
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -169,6 +169,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn); return emisWaybillMapper.selectEmisWaybillByOrderSn(orderSn);
} }
@Override
public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId)
{
return emisWaybillMapper.selectEmisWaybillByCustOrderId(custOrderId);
}
/** /**
* 查询运单列表列表 * 查询运单列表列表
@ -4708,7 +4714,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
// 2.2 检查订单是否已存在 // 2.2 检查订单是否已存在
EmisWaybill existWaybill = selectEmisWaybillByOrderSn(orderNo); EmisWaybill existWaybill = this.selectEmisWaybillByCustOrderId(orderNo);
if (existWaybill != null) { if (existWaybill != null) {
resultList.add(buildFailResult(orderNo, "订单号已存在")); resultList.add(buildFailResult(orderNo, "订单号已存在"));
continue; continue;
@ -4765,7 +4771,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
EmisWaybill waybill = new EmisWaybill(); EmisWaybill waybill = new EmisWaybill();
resetWaybillData(waybill); resetWaybillData(waybill);
waybill.setBillCode(waybillNo); waybill.setBillCode(waybillNo);
waybill.setOrderSn(orderNo); waybill.setOrderSn(WaybillHelper.genOrderSn());
waybill.setCustOrderId(orderNo);
waybill.setTransLineType(transLineType); waybill.setTransLineType(transLineType);
waybill.setProductType(productType); waybill.setProductType(productType);
// 清关方式 1:快递清关,2:自提清关,3:一般贸易清关 // 清关方式 1:快递清关,2:自提清关,3:一般贸易清关

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

@ -507,7 +507,16 @@
</where> </where>
</select> </select>
<!-- 多个运单查询--> <!-- 根据客户订单号查询 -->
<select id="selectEmisWaybillByCustOrderId" parameterType="String" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillDetailVo"/>
<where>
cust_order_id = #{custOrderId}
</where>
</select>
<!-- 多个运单查询-->
<select id="selectEmisWaybillByMutiBillCode" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectEmisWaybillByMutiBillCode" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
where a.del_flag='0' where a.del_flag='0'