diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
index 6bd15490b..b4a7bb3f2 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
@@ -1,11 +1,11 @@
-/**
+/**
* @Project: emis
* @Title: EmisTmsCostFeeController.java
* @author linfso
* @date 2024-10-10 01:53:20
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: TMS运输成本账单 控制器
*/
@@ -48,7 +48,7 @@ import com.xdadan.erp.emis.service.IEmisTmsCostFeeService;
/**
* TMS运输成本账单Controller
- *
+ *
* @author linfso
* @date 2024-10-10 01:53:20
*/
@@ -88,8 +88,8 @@ public class EmisTmsCostFeeController extends BaseController
/**
* 检查是否重复
- *
- * @param emisTmsCostFee
+ *
+ * @param emisTmsCostFee
* @return 数量
*/
@PreAuthorize("@ss.hasPermi('emis:emisTmsCostFee:list')")
@@ -239,6 +239,38 @@ public class EmisTmsCostFeeController extends BaseController
}
+ /**
+ * 批量修改TMS运输成本账单
+ */
+ @PreAuthorize("@ss.hasPermi('emis:emisTmsCostFee:batchEdit')")
+ @Log(title = "TMS运输成本账单", businessType = BusinessType.UPDATE)
+ @PutMapping("/batchEdit")
+ public AjaxResult batchEdit(@RequestBody List emisTmsCostFeeList)
+ {
+ try {
+ if (CollectionUtil.isEmpty(emisTmsCostFeeList)) {
+ return AjaxResult.error("修改数据不能为空");
+ }
+ int updateCount = 0;
+ for (EmisTmsCostFee emisTmsCostFee : emisTmsCostFeeList) {
+ updateCount += emisTmsCostFeeService.updateEmisTmsCostFee(emisTmsCostFee);
+ }
+ return toAjax(updateCount);
+ }catch(EmisBizError ex){
+ ex.printStackTrace();
+ return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage());
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ // 返回子定义异常
+ if(ex instanceof EmisBizError){
+ return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+ }
+
+ return AjaxResult.error("服务器异常，联系客服");
+ }
+ }
+
/**
* 删除TMS运输成本账单
*/
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
index 31d22933d..cdc51a69c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillProblemInfo.java
@@ -93,6 +93,15 @@ public class EmisWaybillProblemInfo extends BaseEntity
private String blSee;
/* 文件路径 */
private String filePath;
+ /* 寄件日期 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date sendDate;
+ /* 销售联系人 */
+ private String salesmen;
+ /* 回款联系人 */
+ private String payee;
+ /* 销售支持 */
+ private String salesSupport;
// 扩展 通知网点
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 47428d11d..a52afda5b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -1433,6 +1433,23 @@
and payment_status != '1'
+
+ and a.payment_status in ('0','2')
+ and a.payment_due_date is not null
+ and DATE(a.payment_due_date) CURDATE()
+
+
+
+
+
+
+
+
+
+
+
+
+
and exists (
select 1 from emis_settle_sub_bill b
@@ -1683,6 +1700,21 @@
where id = #{id}
+
+
update emis_settle_bill set del_flag='1' where id = #{id}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index a7f15c37e..e2ede6558 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -32,6 +32,10 @@
+
+
+
+
@@ -43,59 +47,78 @@
- select id, bill_code, main_bill_code, bl_sub_bill, problem_type, problem_title, problem_cause, send_site, send_site_code, register_man_code, register_man_dept, register_site_code, register_date, register_save_date, data_from, status, is_send_site_register, bl_reversion, reversion_str, reversion_man, reversion_man_code, reversion_site_code, reversion_date, bl_checkok, deal_result, bl_see, file_path, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_problem_info
+ select
+ a.id, a.bill_code, a.main_bill_code, a.bl_sub_bill, a.problem_type, a.problem_title, a.problem_cause,
+ a.send_site, a.send_site_code, a.register_man_code, a.register_man_dept, a.register_site_code,
+ a.register_date, a.register_save_date, a.data_from, a.status, a.is_send_site_register, a.bl_reversion,
+ a.reversion_str, a.reversion_man, a.reversion_man_code, a.reversion_site_code, a.reversion_date,
+ a.bl_checkok, a.deal_result, a.bl_see, a.file_path, a.del_flag, a.create_by, a.create_time,
+ a.update_by, a.update_time, a.remark, a.create_site, a.update_site,
+ b.send_date, b.salesmen, b.payee, c.sales_support
+ from emis_waybill_problem_info a
+ left join emis_waybill b on a.bill_code = b.bill_code and b.del_flag = '0'
+ left join emis_waybill_other c on b.bill_code = c.bill_code and c.del_flag = '0'