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-21 07:59:24 +08:00
parent ab40bc44eb
commit 50d4747106
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
// 转件登记 // 转件登记
public int updateTransferInfo(EmisWaybill emisWaybill); public int updateTransferInfo(EmisWaybill emisWaybill);
public int checkWaybillIsExists(@Param("billCode")String billCode); public int checkWaybillIsExists(@Param("billCode")String billCode,@Param("childSeqNo") String childSeqNo);
public int checkWaybillIsSign(@Param("billCode")String billCode); public int checkWaybillIsSign(@Param("billCode")String billCode);

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1403,7 +1403,7 @@ public class EmisBaseService {
* @param billCode * @param billCode
* @return * @return
*/ */
public boolean checkWaybillIsExists(String billCode){ public boolean checkWaybillIsExists(String billCode,Integer childNum){
return emisWaybillMapper.checkWaybillIsExists(billCode)==1; return emisWaybillMapper.checkWaybillIsExists(billCode)==1;
} }

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

@ -274,6 +274,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"扫描单号必填"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"扫描单号必填");
} }
billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr); billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr);
String[] billCodeArr = billCodeInStr.split(","); String[] billCodeArr = billCodeInStr.split(",");
@ -480,6 +483,15 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"合包重量不能为0"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"合包重量不能为0");
} }
String preOrNextStationCode = MapUtils.getString(scanDataItem,"preOrNextStationCode",null);
if(StringUtils.isEmpty(preOrNextStationCode)) {
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"下一站必填");
}
// 判断是否必拆，不同国家必拆
boolean blUnPack=false;
Map countryMap = new HashMap();
// 子单号处理 // 子单号处理
for (String scanBillCode : billCodeArr) { for (String scanBillCode : billCodeArr) {
// 返回原始数据返回 // 返回原始数据返回
@ -583,6 +595,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
emisTmsPack.setTotalWeight(scanWeight); emisTmsPack.setTotalWeight(scanWeight);
emisTmsPack.setTotalWaybillQty(mainBillMap.size()); emisTmsPack.setTotalWaybillQty(mainBillMap.size());
emisTmsPack.setTotalParcelQty(billCodeArr.length); emisTmsPack.setTotalParcelQty(billCodeArr.length);
emisTmsPack.setPackStatus("1");
emisTmsPack.setPrintStatus("1");
emisTmsPack.setSendStiteCode(getCurrentUser().getOwnerSiteCode());
emisTmsPack.setNextSiteCode(preOrNextStationCode);
emisTmsPack.setPackDate(scanDate);
emisTmsPack.setPackName(getCurrentUser().getOwnerSiteName()+"组包:"+packNo);
int eCnt=emisTmsPackMapper.checkUnique(emisTmsPack); int eCnt=emisTmsPackMapper.checkUnique(emisTmsPack);
if(eCnt>0){ if(eCnt>0){

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

@ -232,9 +232,14 @@
group by waybill_status group by waybill_status
</select> </select>
<!-- 检查运单号是否已存在 --> <!-- 检查运单号及子单号是否存在 -->
<select id="checkWaybillIsExists" parameterType="String" resultType="int"> <select id="checkWaybillIsExists" resultType="int">
select count(1) as cnt from emis_waybill where bill_code=#{billCode} limit 1 select count(1) as cnt from emis_waybill
where bill_code=#{billCode}
<if test="childSeqNo != null and childSeqNo != ''">
and waybill_status=#{waybillStatus}
</if>
limit 1
</select> </select>
<!-- 检查运单号是否签收 --> <!-- 检查运单号是否签收 -->