md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java

@@ -89,6 +89,12 @@ public class EmisWaybillController extends EmisBaseController
     @Autowired
     private IEmisTmsScanRecordService emisTmsScanRecordService;
 
+
+    @RequestMapping(value = "/checkWaybillIsExists")
+    public AjaxResult checkWaybillIsExists(String billCode){
+        return AjaxResult.success("操作成功", emisBaseService.checkWaybillIsExists(billCode));
+    }
+
     /**
      * 获取电子运单信息
      */

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

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

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

@@ -825,6 +825,12 @@ public class EmisBaseService {
      }
 
 
+
+     public boolean checkWaybillIsExists(String billCode){
+        return emisWaybillMapper.checkWaybillIsExists(billCode)==1
+     }
+
+
      /**
       * 改变运单上站点
       * @param billCode

emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml

@@ -225,6 +225,11 @@
         group by waybill_status
     </select>
 
+    <!--  检查运单号是否已存在 -->
+    <select id="checkWaybillIsExists" parameterType="String" resultType="int">
+        select count(1) as cnt from emis_waybill where bill_code=#{billCode} limit 1
+    </select>
+
 
     <select id="selectCommissionStatDataByEmp" parameterType="String" resultType="map">
         select waybill_status as waybillStatus,count(1) as cnt from emis_waybill
@@ -545,11 +550,13 @@
 
             <if test="params.isNeedPack != null and params.isNeedPack == 1">
                 and a.bill_code not in( select etp.bill_code from emis_tms_pack_dtl etp  where etp.del_flag='0'  )
+                and a.blIsQuestion = '0'
             </if>
 
 
             <if test="params.isNeedBatch != null and params.isNeedBatch == 1">
                 and a.bill_code not in( select etb.bill_code from emis_tms_site_batch_dtl etb   where etb.del_flag='0'  )
+                and a.blIsQuestion = '0'
             </if>