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 2025-04-24 12:27:47 +08:00
parent 8e35aafbbd
commit b086583c45
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransLineController.java
View File

@ -72,7 +72,7 @@ public class EmisTransLineController extends EmisBaseController
* 查询线路列表 -- 精简 * 查询线路列表 -- 精简
*/ */
// @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')") // @PreAuthorize("@ss.hasPermi('emis:emisTransLine:list')")
@JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate",},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"id","lineCode","lineName","lineNameEn","meterRate","transType"},value= EmisTransLine.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimple") @GetMapping("/listSimple")
public TableDataInfo listSimple(EmisTransLine emisTransLine) public TableDataInfo listSimple(EmisTransLine emisTransLine)
{ {

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

@ -194,6 +194,9 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
public int checkWaybillIsSign(@Param("billCode")String billCode); public int checkWaybillIsSign(@Param("billCode")String billCode);
// 判断是否已经接单
public int checkWaybillIsConfirm(@Param("billCode")String billCode);
/** /**

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

@ -618,6 +618,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
return itemList; return itemList;
} }
// bug:1454,未开单不允许扫描
// 已签收不允许扫描 // 已签收不允许扫描
boolean isSign = checkWaybillIsSign(mainBillCode); boolean isSign = checkWaybillIsSign(mainBillCode);
if (isSign) { if (isSign) {

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

@ -267,6 +267,11 @@
select count(1) as cnt from emis_waybill where bill_code=#{billCode} and bl_sign='1' limit 1 select count(1) as cnt from emis_waybill where bill_code=#{billCode} and bl_sign='1' limit 1
</select> </select>
<!-- 检查运单号是否已接单 -->
<select id="checkWaybillIsConfirm" parameterType="String" resultType="int">
select count(1) as cnt from emis_waybill where bill_code=#{billCode} and bl_sign='1' limit 1
</select>
<select id="selectCommissionStatData" parameterType="String" resultType="map"> <select id="selectCommissionStatData" parameterType="String" resultType="map">
select waybill_status as waybillStatus,count(1) as cnt from emis_waybill select waybill_status as waybillStatus,count(1) as cnt from emis_waybill