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-07-06 14:29:48 +08:00
parent f020cbe9ad
commit 11aeedbcfc
3 changed files with 21 additions and 10 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/service/EmisBaseService.java
View File

@ -900,7 +900,7 @@ public class EmisBaseService {
emisSettleSubBill.setBillDate(new Date());
// 账单类型 1-现金 2-月结
if( StringUtils.endsWithAny(dt.getPaymentType(),"2","4","5")) {
if( StringUtils.equalsAny(dt.getPaymentType(),"2","4","5")) {
emisSettleSubBill.setSettleType("2");
}else{
emisSettleSubBill.setSettleType("1");

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

@ -839,15 +839,17 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 如果是缅甸允许主单扫描,其他都不允许
if("0095".equals(emisWaybill.getReceiveCountry()) ){
// 缅甸只允许主单
if (!mainBillCode.equals(scanBillCode)) {
scanResultItem.setResult("fail");
scanResultItem.setMessage("缅甸只允许主单");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem);
return itemList;
// throw new EmisBizError(EmisBizErrorType.SCAN_NO_ALLOW, "缅甸只允许主单");
}
// 缅甸不限制,但要判断，子单和主单只能存在一种单号
emisTmsScanRecordMapper.checkSiteScanUnique()
// if (!mainBillCode.equals(scanBillCode)) {
// scanResultItem.setResult("fail");
// scanResultItem.setMessage("缅甸只允许主单");
// scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
// itemList.add(scanResultItem);
// return itemList;
// }
}else{
if (mainBillCode.equals(scanBillCode)) {
scanResultItem.setResult("fail");

9
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -167,6 +167,15 @@
limit 1
</select>
<!-- 检查站点合包扫描是否合法 -->
<select id="checkSitePackScanUnique" parameterType="EmisTmsScanRecord" resultType="int">
select count(1) from emis_tms_scan_record
where del_flag='0' and bill_code = #{billCode} and scan_type=#{scanType}
and scan_site_code=#{scanSiteCode}
and to_days(create_time) = to_days(now())
limit 1
</select>
<!-- 根据主单获取物流轨迹 -->
<select id="selectTraceListByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
<include refid="selectEmisTmsScanRecordVo"/>