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-07 14:30:33 +08:00
parent 5752e8658a
commit a812cd83d7
2 changed files with 111 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -554,56 +554,56 @@ public class EmisWaybillController extends EmisBaseController
JSONArray jArr = new JSONArray();
String printManCode=getLoginUser().getUser().getEmpCode();
String strArry=PrintUtils.getPdfByBillCode(billCode,printType,printManCode);
// 先检查运单是否存在
String tplCodeStr=WaybillHelper.formatQueryValue(printType);
String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode);
JSONArray fileArr = JSONArray.parseArray(strArry);
for(Object objFile:fileArr) {
JSONObject jObjFileItem=(JSONObject)objFile;
String result=jObjFileItem.getString("result");
String billCodeItem=jObjFileItem.getString("billCodeItem");
JSONObject jObjFileItem = (JSONObject) objFile;
String result = jObjFileItem.getString("result");
String billCodeItem = jObjFileItem.getString("billCodeItem");
JSONObject printItem = new JSONObject();
printItem.put("billCode",billCodeItem);
if("success".equals(result)){
String pdfbase64=jObjFileItem.getString("file");
try
{
String fileId = UUID.fastUUID().toString();
String fileUploadDir = PayConfig.getUploadPath()+File.separator+DateUtils.datePath();
printItem.put("billCode", billCodeItem);
if (!"success".equals(result)) {
continue;
}
File saveDir = new File(fileUploadDir);
if(!saveDir.exists()){
saveDir.mkdirs();
}
String pdfbase64 = jObjFileItem.getString("file");
try {
String fileId = UUID.fastUUID().toString();
String fileUploadDir = PayConfig.getUploadPath() + File.separator + DateUtils.datePath();
String saveFileName = fileUploadDir+File.separator+fileId+".jpg";
FileOutputStream os = new FileOutputStream(saveFileName);//输出流
IXddTplPrint tplPrint = new TanexTplPrintImpl();
PrintUtils.genImage(pdfbase64, os);
JSONObject jObjRemark = new JSONObject();
jObjRemark.put("billCode",billCodeItem);
jObjRemark.put("billCodeRange",billCodeRange);
jObjRemark.put("lang",lang);
jObjRemark.put("printType",printType);
SysFileInfo sysFileInfo=sysFileInfoService.ossUploadLocalFile(saveFileName,billCodeItem,jObjRemark.toJSONString());
String imageUrl = sysFileInfo.getFileRemoteUrl();
printItem.put("imageUrl", imageUrl);
printItem.put("result","success");
printItem.put("message","success");
File saveDir = new File(fileUploadDir);
if (!saveDir.exists()) {
saveDir.mkdirs();
}
catch (Exception e)
{
e.printStackTrace();
printItem.put("imageUrl", "");
printItem.put("result","fail");
printItem.put("message","生成图片异常");
}
String saveFileName = fileUploadDir + File.separator + fileId + ".jpg";
FileOutputStream os = new FileOutputStream(saveFileName);//输出流
IXddTplPrint tplPrint = new TanexTplPrintImpl();
PrintUtils.genImage(pdfbase64, os);
JSONObject jObjRemark = new JSONObject();
jObjRemark.put("billCode", billCodeItem);
jObjRemark.put("billCodeRange", billCodeRange);
jObjRemark.put("lang", lang);
jObjRemark.put("printType", printType);
SysFileInfo sysFileInfo = sysFileInfoService.ossUploadLocalFile(saveFileName, billCodeItem, jObjRemark.toJSONString());
String imageUrl = sysFileInfo.getFileRemoteUrl();
printItem.put("imageUrl", imageUrl);
printItem.put("result", "success");
printItem.put("message", "success");
} catch (Exception e) {
e.printStackTrace();
printItem.put("imageUrl", "");
printItem.put("result", "fail");
printItem.put("message", "生成图片异常");
}
jArr.add(printItem);
}
// JSONArray jArr = new JSONArray();

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

@ -287,23 +287,23 @@
<if test="custOrderId != null and custOrderId != ''"> and cust_order_id=#{custOrderId}</if>
<if test="billCodeSub != null and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status like concat('%', #{orderStatus}, '%')</if>
<if test="waybillStatus != null and waybillStatus != ''"> and waybill_status like concat('%', #{waybillStatus}, '%')</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status=#{orderStatus}</if>
<if test="waybillStatus != null and waybillStatus != ''"> and waybill_status=#{waybillStatus}</if>
<if test="orderType != null and orderType != ''"> and order_type like concat('%', #{orderType}, '%')</if>
<if test="orderDate != null "> and order_date = #{orderDate}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="customerCode != null and customerCode != ''"> and customer_code=#{customerCode}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="openId != null and openId != ''"> and open_id like concat('%', #{openId}, '%')</if>
<if test="receiveName != null and receiveName != ''"> and receive_name like concat('%', #{receiveName}, '%')</if>
<if test="receiveCompany != null and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
<if test="receiveMobile != null and receiveMobile != ''"> and receive_mobile like concat('%', #{receiveMobile}, '%')</if>
<if test="receiveTel != null and receiveTel != ''"> and receive_tel like concat('%', #{receiveTel}, '%')</if>
<if test="receiveCountry != null and receiveCountry != ''"> and receive_country like concat('%', #{receiveCountry}, '%')</if>
<if test="receiveProvince != null and receiveProvince != ''"> and receive_province like concat('%', #{receiveProvince}, '%')</if>
<if test="receiveCity != null and receiveCity != ''"> and receive_city like concat('%', #{receiveCity}, '%')</if>
<if test="receiveCounty != null and receiveCounty != ''"> and receive_county like concat('%', #{receiveCounty}, '%')</if>
<if test="receiveTown != null and receiveTown != ''"> and receive_town like concat('%', #{receiveTown}, '%')</if>
<if test="receiveCountry != null and receiveCountry != ''"> and receive_country=#{receiveCountry}</if>
<if test="receiveProvince != null and receiveProvince != ''"> and receive_province=#{receiveProvince}</if>
<if test="receiveCity != null and receiveCity != ''"> and receive_city=#{receiveCity}</if>
<if test="receiveCounty != null and receiveCounty != ''"> and receive_county=#{receiveCounty}</if>
<if test="receiveTown != null and receiveTown != ''"> and receive_town=#{receiveTown}</if>
<if test="receiveAddress != null and receiveAddress != ''"> and receive_address like concat('%', #{receiveAddress}, '%')</if>
<if test="receivePostcode != null and receivePostcode != ''"> and receive_postcode like concat('%', #{receivePostcode}, '%')</if>
<if test="receivePcd != null and receivePcd != ''"> and receive_pcd like concat('%', #{receivePcd}, '%')</if>
@ -311,29 +311,28 @@
<if test="sendCompany != null and sendCompany != ''"> and send_company like concat('%', #{sendCompany}, '%')</if>
<if test="sendMobile != null and sendMobile != ''"> and send_mobile like concat('%', #{sendMobile}, '%')</if>
<if test="sendTel != null and sendTel != ''"> and send_tel like concat('%', #{sendTel}, '%')</if>
<if test="sendCountry != null and sendCountry != ''"> and send_country like concat('%', #{sendCountry}, '%')</if>
<if test="sendProvince != null and sendProvince != ''"> and send_province like concat('%', #{sendProvince}, '%')</if>
<if test="sendCity != null and sendCity != ''"> and send_city like concat('%', #{sendCity}, '%')</if>
<if test="sendCounty != null and sendCounty != ''"> and send_county like concat('%', #{sendCounty}, '%')</if>
<if test="sendTown != null and sendTown != ''"> and send_town like concat('%', #{sendTown}, '%')</if>
<if test="sendCountry != null and sendCountry != ''"> and send_country=#{sendCountry}</if>
<if test="sendProvince != null and sendProvince != ''"> and send_province=#{sendProvince}</if>
<if test="sendCity != null and sendCity != ''"> and send_city=#{sendCity}</if>
<if test="sendCounty != null and sendCounty != ''"> and send_county=#{sendCounty}</if>
<if test="sendTown != null and sendTown != ''"> and send_town=#{sendTown}</if>
<if test="sendAddress != null and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
<if test="sendPostcode != null and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
<if test="sendPcd != null and sendPcd != ''"> and send_pcd like concat('%', #{sendPcd}, '%')</if>
<if test="paymentType != null and paymentType != ''"> and payment_type like concat('%', #{paymentType}, '%')</if>
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type like concat('%', #{calcFeeType}, '%')</if>
<if test="paymentType != null and paymentType != ''"> and payment_type=#{paymentType}</if>
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
<if test="productType != null and productType != ''"> and product_type=#{productType}</if>
<if test="timeType != null and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
<if test="meterType != null and meterType != ''"> and meter_type like concat('%', #{meterType}, '%')</if>
<if test="carryType != null and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
<if test="customsClear != null and customsClear != ''"> and customs_clear like concat('%', #{customsClear}, '%')</if>
<if test="customsEclaration != null and customsEclaration != ''"> and customs_eclaration like concat('%', #{customsEclaration}, '%')</if>
<if test="customsClear != null and customsClear != ''"> and customs_clear=#{customsClear}</if>
<if test="customsEclaration != null and customsEclaration != ''"> and customs_eclaration=#{customsEclaration}</if>
<if test="estimateDate != null "> and estimate_date = #{estimateDate}</if>
<if test="packType != null and packType != ''"> and pack_type like concat('%', #{packType}, '%')</if>
<if test="dispatchMethod != null and dispatchMethod != ''"> and dispatch_method like concat('%', #{dispatchMethod}, '%')</if>
<if test="pickupMethod != null and pickupMethod != ''"> and pickup_method like concat('%', #{pickupMethod}, '%')</if>
<if test="packType != null and packType != ''"> and FIND_IN_SET(#{packType},pack_type)</if>
<if test="dispatchMethod != null and dispatchMethod != ''"> and dispatch_method=#{dispatchMethod}</if>
<if test="pickupMethod != null and pickupMethod != ''"> and pickup_method= #{pickupMethod}</if>
<if test="pickStartDate != null "> and pick_start_date = #{pickStartDate}</if>
<if test="pickFinishDate != null "> and pick_finish_date = #{pickFinishDate}</if>
<if test="pickFailReason != null and pickFailReason != ''"> and pick_fail_reason like concat('%', #{pickFailReason}, '%')</if>
@ -346,10 +345,8 @@
<if test="warehouseInNo != null and warehouseInNo != ''"> and warehouse_in_no like concat('%', #{warehouseInNo}, '%')</if>
<if test="customerDeliveryBeginTime != null and customerDeliveryBeginTime != ''"> and customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')</if>
<if test="customerDeliveryEndTime != null and customerDeliveryEndTime != ''"> and customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')</if>
<if test="goodsType != null and goodsType != ''"> and goods_type like concat('%', #{goodsType}, '%')</if>
<if test="goodsInfo != null and goodsInfo != ''"> and goods_info like concat('%', #{goodsInfo}, '%')</if>
<if test="goodsPics != null and goodsPics != ''"> and goods_pics like concat('%', #{goodsPics}, '%')</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''"> and bl_prepare_in_freight like concat('%', #{blPrepareInFreight}, '%')</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''"> and bl_prepare_in_freight=#{blPrepareInFreight}</if>
<if test="prepareInEstFee != null "> and prepare_in_est_fee = #{prepareInEstFee}</if>
<if test="prepareInRealFee != null "> and prepare_in_real_fee = #{prepareInRealFee}</if>
<if test="prepareInExpress != null and prepareInExpress != ''"> and prepare_in_express like concat('%', #{prepareInExpress}, '%')</if>
@ -361,92 +358,84 @@
<if test="parcelQty != null "> and parcel_qty = #{parcelQty}</if>
<if test="billWeight != null "> and bill_weight = #{billWeight}</if>
<if test="volumeWeight != null "> and volume_weight = #{volumeWeight}</if>
<if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
<if test="currency != null and currency != ''"> and currency= #{currency}</if>
<if test="settlementWeight != null "> and settlement_weight = #{settlementWeight}</if>
<if test="scanWeight != null "> and scan_weight = #{scanWeight}</if>
<if test="feeWeight != null "> and fee_weight = #{feeWeight}</if>
<if test="freight != null "> and freight = #{freight}</if>
<if test="realPaymentType != null and realPaymentType != ''"> and real_payment_type like concat('%', #{realPaymentType}, '%')</if>
<if test="realPaymentType != null and realPaymentType != ''"> and real_payment_type=#{realPaymentType}</if>
<if test="realFee != null "> and real_fee = #{realFee}</if>
<if test="blSpecialQuote != null and blSpecialQuote != ''"> and bl_special_quote like concat('%', #{blSpecialQuote}, '%')</if>
<if test="blOverLong != null and blOverLong != ''"> and bl_over_long like concat('%', #{blOverLong}, '%')</if>
<if test="blBill != null and blBill != ''"> and bl_bill like concat('%', #{blBill}, '%')</if>
<if test="blSpecialQuote != null and blSpecialQuote != ''"> and bl_special_quote=#{blSpecialQuote}</if>
<if test="blOverLong != null and blOverLong != ''"> and bl_over_long=#{blOverLong}</if>
<if test="blBill != null and blBill != ''"> and bl_bill=#{blBill}</if>
<if test="blSign != null and blSign != ''"> and bl_sign=#{blSign}</if>
<if test="blBillText != null and blBillText != ''"> and bl_bill_text like concat('%', #{blBillText}, '%')</if>
<if test="blOverWeight != null and blOverWeight != ''"> and bl_over_weight like concat('%', #{blOverWeight}, '%')</if>
<if test="overWeightNumber != null and overWeightNumber != ''"> and over_weight_number like concat('%', #{overWeightNumber}, '%')</if>
<if test="feeRemaker != null and feeRemaker != ''"> and fee_remaker like concat('%', #{feeRemaker}, '%')</if>
<if test="thirdCode != null and thirdCode != ''"> and third_code like concat('%', #{thirdCode}, '%')</if>
<if test="realValue != null and realValue != ''"> and real_value like concat('%', #{realValue}, '%')</if>
<if test="blInsure != null and blInsure != ''"> and bl_insure like concat('%', #{blInsure}, '%')</if>
<if test="blInsure != null and blInsure != ''"> and bl_insure= #{blInsure}</if>
<if test="insureValue != null and insureValue != ''"> and insure_value like concat('%', #{insureValue}, '%')</if>
<if test="insureValueCurrency != null and insureValueCurrency != ''"> and insure_value_currency like concat('%', #{insureValueCurrency}, '%')</if>
<if test="insureFeeCurrency != null and insureFeeCurrency != ''"> and insure_fee_currency like concat('%', #{insureFeeCurrency}, '%')</if>
<if test="insureFee != null "> and insure_fee = #{insureFee}</if>
<if test="insureRemark != null and insureRemark != ''"> and insure_remark like concat('%', #{insureRemark}, '%')</if>
<if test="insureSiteCode != null and insureSiteCode != ''"> and insure_site_code like concat('%', #{insureSiteCode}, '%')</if>
<if test="insureDate != null and insureDate != ''"> and insure_date like concat('%', #{insureDate}, '%')</if>
<if test="blPrint != null and blPrint != ''"> and bl_print like concat('%', #{blPrint}, '%')</if>
<if test="insureSiteCode != null and insureSiteCode != ''"> and insure_site_code=#{insureSiteCode}</if>
<if test="blPrint != null and blPrint != ''"> and bl_print=#{blPrint}</if>
<if test="printManCode != null and printManCode != ''"> and print_man_code like concat('%', #{printManCode}, '%')</if>
<if test="printSite != null and printSite != ''"> and print_site like concat('%', #{printSite}, '%')</if>
<if test="printSite != null and printSite != ''"> and print_site=#{printSite},</if>
<if test="printDate != null and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
<if test="printCount != null and printCount != ''"> and print_count like concat('%', #{printCount}, '%')</if>
<if test="blDispFd != null and blDispFd != ''"> and bl_disp_fd like concat('%', #{blDispFd}, '%')</if>
<if test="blDispFd != null and blDispFd != ''"> and bl_disp_fd=#{blDispFd}</if>
<if test="transferCode != null and transferCode != ''"> and transfer_code like concat('%', #{transferCode}, '%')</if>
<if test="transferBillcode != null and transferBillcode != ''"> and transfer_billcode like concat('%', #{transferBillcode}, '%')</if>
<if test="dispFdDate != null "> and disp_fd_date = #{dispFdDate}</if>
<if test="dispFdReason != null and dispFdReason != ''"> and disp_fd_reason like concat('%', #{dispFdReason}, '%')</if>
<if test="currentSiteCode != null and currentSiteCode != ''"> and current_site_code like concat('%', #{currentSiteCode}, '%')</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
<if test="lastSiteCode != null and lastSiteCode != ''"> and last_site_code like concat('%', #{lastSiteCode}, '%')</if>
<if test="registerSiteCode != null and registerSiteCode != ''"> and register_site_code like concat('%', #{registerSiteCode}, '%')</if>
<if test="currentSiteCode != null and currentSiteCode != ''"> and current_site_code=#{currentSiteCode}</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code= #{nextSiteCode}</if>
<if test="lastSiteCode != null and lastSiteCode != ''"> and last_site_code=#{lastSiteCode}</if>
<if test="registerSiteCode != null and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
<if test="registerDate != null "> and register_date = #{registerDate}</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code like concat('%', #{registerManCode}, '%')</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and take_piece_employee_code like concat('%', #{takePieceEmployeeCode}, '%')</if>
<if test="registerManCode != null and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
<if test="takePieceEmployeeCode != null and takePieceEmployeeCode != ''"> and take_piece_employee_code=#{takePieceEmployeeCode}</if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and send_site_code=#{sendSiteCode}</if>
<if test="sendDate != null "> and send_date = #{sendDate}</if>
<if test="dispatchManCode != null and dispatchManCode != ''"> and dispatch_man_code like concat('%', #{dispatchManCode}, '%')</if>
<if test="dispatchDate != null and dispatchDate != ''"> and dispatch_date like concat('%', #{dispatchDate}, '%')</if>
<if test="dispatchSiteCode != null and dispatchSiteCode != ''"> and dispatch_site_code like concat('%', #{dispatchSiteCode}, '%')</if>
<if test="dispatchManCode != null and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
<if test="dispatchSiteCode != null and dispatchSiteCode != ''"> and dispatch_site_code=#{dispatchSiteCode}</if>
<if test="produceBillDate != null "> and produce_bill_date = #{produceBillDate}</if>
<if test="produceBillSiteCode != null and produceBillSiteCode != ''"> and produce_bill_site_code like concat('%', #{produceBillSiteCode}, '%')</if>
<if test="produceBillManCode != null and produceBillManCode != ''"> and produce_bill_man_code like concat('%', #{produceBillManCode}, '%')</if>
<if test="destinationCode != null and destinationCode != ''"> and destination_code like concat('%', #{destinationCode}, '%')</if>
<if test="destinationProvince != null and destinationProvince != ''"> and destination_province like concat('%', #{destinationProvince}, '%')</if>
<if test="destinationCity != null and destinationCity != ''"> and destination_city like concat('%', #{destinationCity}, '%')</if>
<if test="destinationCounty != null and destinationCounty != ''"> and destination_county like concat('%', #{destinationCounty}, '%')</if>
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code like concat('%', #{dispatchUnderlingSiteCode}, '%')</if>
<if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code like concat('%', #{destinationCenterCode}, '%')</if>
<if test="marketManCode != null and marketManCode != ''"> and market_man_code like concat('%', #{marketManCode}, '%')</if>
<if test="payee != null and payee != ''"> and payee like concat('%', #{payee}, '%')</if>
<if test="produceBillSiteCode != null and produceBillSiteCode != ''"> and produce_bill_site_code=#{produceBillSiteCode}</if>
<if test="produceBillManCode != null and produceBillManCode != ''"> and produce_bill_man_code=#{produceBillManCode}</if>
<if test="destinationCode != null and destinationCode != ''"> and destination_code =#{destinationCode}</if>
<if test="destinationProvince != null and destinationProvince != ''"> and destination_province=#{destinationProvince}</if>
<if test="destinationCity != null and destinationCity != ''"> and destination_city=#{destinationCity}</if>
<if test="destinationCounty != null and destinationCounty != ''"> and destination_county=#{destinationCounty}</if>
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
<if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
<if test="marketManCode != null and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
<if test="payee != null and payee != ''"> and payee=#{payee}</if>
<if test="salesmen != null and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code like concat('%', #{operateEmployeeCode}, '%')</if>
<if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question like concat('%', #{blIsQuestion}, '%')</if>
<if test="problemType != null and problemType != ''"> and problem_type like concat('%', #{problemType}, '%')</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
<if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
<if test="problemType != null and problemType != ''"> and problem_type=#{problemType}</if>
<if test="problemCause != null and problemCause != ''"> and problem_cause like concat('%', #{problemCause}, '%')</if>
<if test="problemDelayDays != null "> and problem_delay_days = #{problemDelayDays}</if>
<if test="blMessage != null and blMessage != ''"> and bl_message like concat('%', #{blMessage}, '%')</if>
<if test="blAcceptMessage != null and blAcceptMessage != ''"> and bl_accept_message like concat('%', #{blAcceptMessage}, '%')</if>
<if test="blGenSubbill != null and blGenSubbill != ''"> and bl_gen_subbill like concat('%', #{blGenSubbill}, '%')</if>
<if test="blMessage != null and blMessage != ''"> and bl_message=#{blMessage}</if>
<if test="blAcceptMessage != null and blAcceptMessage != ''"> and bl_accept_message=#{blAcceptMessage}</if>
<if test="blGenSubbill != null and blGenSubbill != ''"> and bl_gen_subbill=#{blGenSubbill}</if>
<if test="signMan != null and signMan != ''"> and sign_man like concat('%', #{signMan}, '%')</if>
<if test="signManCode != null and signManCode != ''"> and sign_man_code like concat('%', #{signManCode}, '%')</if>
<if test="signSiteCode != null and signSiteCode != ''"> and sign_site_code like concat('%', #{signSiteCode}, '%')</if>
<if test="signDate != null and signDate != ''"> and sign_date like concat('%', #{signDate}, '%')</if>
<if test="billPicSendRmk != null and billPicSendRmk != ''"> and bill_pic_send_rmk like concat('%', #{billPicSendRmk}, '%')</if>
<if test="billPicDispatchRmk != null and billPicDispatchRmk != ''"> and bill_pic_dispatch_rmk like concat('%', #{billPicDispatchRmk}, '%')</if>
<if test="timezoneOffset != null and timezoneOffset != ''"> and timezone_offset like concat('%', #{timezoneOffset}, '%')</if>
<if test="paymentStatus != null and paymentStatus != ''"> and payment_status like concat('%', #{paymentStatus}, '%')</if>
<if test="signManCode != null and signManCode != ''"> and sign_man_code=#{signManCode}</if>
<if test="signSiteCode != null and signSiteCode != ''"> and sign_site_code=#{signSiteCode}</if>
<if test="paymentStatus != null and paymentStatus != ''"> and payment_status =#{paymentStatus}</if>
<if test="paymentDate != null "> and payment_date = #{paymentDate}</if>
<if test="paymentRemark != null and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
<if test="orderRemark != null and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
<if test="dataFrom != null and dataFrom != ''"> and data_from like concat('%', #{dataFrom}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by= #{createBy}</if>
<if test="updateBy != null and updateBy != ''"> and update_by=#{updateBy}</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''">
and send_date <![CDATA[ >= ]]> #{params.beginSendDate}
@ -467,10 +456,14 @@
</if>
<if test="params.printFlag != null and params.printFlag != ''">
and bl_print=#{params.printFlag}
</if>
<if test="params.isNeedPack != null and params.isNeedPack == 1">
and bill_code not in( select bill_code from emis_tms_pack_dtl where del_flag='0' )
</if>