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-05-22 23:08:17 +08:00
parent a4eab647cb
commit 1cb2b129dc
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -257,11 +257,13 @@ public class WaybillOrder implements Serializable {
//扩展信息------- //扩展信息-------
/* 寄件客户客户名称 */ /* 客户名称 */
private String customerName; private String customerName;
// 取件员 // 取件员
private String takePieceEmployeeName; private String takePieceEmployeeName;
// 操作员
private String operateEmployeeName;
private String sendSiteName; private String sendSiteName;
// 目的地名称 // 目的地名称
@ -278,8 +280,26 @@ public class WaybillOrder implements Serializable {
private String printSiteName; private String printSiteName;
// 销售,回款 // 销售,回款
private String salesmenName; // private String salesmenName;
private String payeeName; // private String payeeName;
// 客户名称(月结时候使用): customerName
// 线路名称: transLineTypeName
// 产品类型名称: productTypeName
// 操作员名称: operateEmployeeName
//
// 收件员名称 : takePieceEmployeeName
//
// 派件员名称 : dispatchManName
// 派件网点名称 : dispatchSiteName
//
// 月结账户名称 : customerName
// 销售联系人名称:salesmen
// 回款联系人名称: payee
//
// 发件网点名称:sendSiteName
// 目的地名称:destinationName
// 目的网点名称:dispatchUnderlingSiteName
/** /**
@ -365,14 +385,16 @@ public class WaybillOrder implements Serializable {
voItem.setCustomerName(dbWaybill.getCustomerName()); voItem.setCustomerName(dbWaybill.getCustomerName());
voItem.setSendSiteName(dbWaybill.getSendSiteName()); voItem.setSendSiteName(dbWaybill.getSendSiteName());
voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName()); voItem.setTakePieceEmployeeName(dbWaybill.getTakePieceEmployeeName());
voItem.setOperateEmployeeName(dbWaybill.getOperateEmployeeName());
voItem.setDestinationName(dbWaybill.getDestinationName()); voItem.setDestinationName(dbWaybill.getDestinationName());
voItem.setDispatchUnderlingSiteName(dbWaybill.getDispatchUnderlingSiteName()); voItem.setDispatchUnderlingSiteName(dbWaybill.getDispatchUnderlingSiteName());
voItem.setDispatchSiteName(dbWaybill.getDispatchSiteName()); voItem.setDispatchSiteName(dbWaybill.getDispatchSiteName());
voItem.setDispatchManName(dbWaybill.getDispatchManName()); voItem.setDispatchManName(dbWaybill.getDispatchManName());
voItem.setPrintManName(dbWaybill.getPrintManName()); voItem.setPrintManName(dbWaybill.getPrintManName());
voItem.setPrintSiteName(dbWaybill.getPrintSiteName()); voItem.setPrintSiteName(dbWaybill.getPrintSiteName());
voItem.setSalesmenName(dbWaybill.getSalesmenName()); // voItem.setSalesmenName(dbWaybill.getSalesmenName());
voItem.setPayeeName(dbWaybill.getPayeeName()); // voItem.setPayeeName(dbWaybill.getPayeeName());
// voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode()); // voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode());

19
emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
View File

@ -128,4 +128,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="checkUnique" parameterType="EmisSpecialCalcWeight" resultType="int">
select count(1) from emis_special_calc_weight
where del_flag='0'
and id = #{id}
and prod_code = #{prodCode}
and begin_weight = #{beginWeight}
and end_weight = #{endWeight}
and begin_date = #{beginDate}
and end_date = #{endDate}
limit 1
</select>
</mapper> </mapper>