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:57:26 +08:00
parent 85bbb61d28
commit d2bb446030
16 changed files with 27 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
View File

@ -53,9 +53,6 @@ public class EmisCountry extends BaseEntity
private String twoCode;
/* 三字码 */
private String threeCode;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountryArea.java
View File

@ -43,9 +43,6 @@ public class EmisCountryArea extends BaseEntity
private String countryCode;
/* 国际名称 */
private String countryName;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerAddress.java
View File

@ -70,10 +70,7 @@ public class EmisCustomerAddress extends BaseEntity
private String useSite;
/* 使用站点代码 */
private String useSiteCode;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
private String countryName;
private String provinceName;

7
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerSettleBill.java
View File

@ -113,11 +113,6 @@ public class EmisCustomerSettleBill extends BaseEntity
private String refundMoney;
/* 确认人 */
private String confirmMan;
/* 创建站点 */
private String createSite;
/* 创建站点代码 */
private String createSiteCode;
/* 修改站点代码 */
private String modifySiteCode;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
View File

@ -61,10 +61,7 @@ public class EmisDestination extends BaseEntity
private Integer isHinterland;
/* 管辖片区id */
private Long countryAreaId;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
// 扩展vo字段
private String lineName;

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisFeeType.java
View File

@ -42,9 +42,6 @@ public class EmisFeeType extends BaseEntity
private String feeTypeNameEn;
/* 启用状态 0-启用 1-停用 */
private Integer status;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java
View File

@ -122,10 +122,7 @@ public class EmisMonthpayAccount extends BaseEntity
private String sender;
/* 寄件地址 */
private String sendAddress;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
private String countryName;

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayUseApply.java
View File

@ -57,9 +57,6 @@ public class EmisMonthpayUseApply extends BaseEntity
private String auditBy;
/* 审核验证码 */
private String msgCode;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisNotCalcAging.java
View File

@ -43,9 +43,6 @@ public class EmisNotCalcAging extends BaseEntity
private Date noCalcDay;
/* 启用状态 0-启用 1-停用 */
private Integer status;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteExpression.java
View File

@ -56,9 +56,6 @@ public class EmisQuoteExpression extends BaseEntity
private String calculateExpression;
/* 启用状态 0-启用 1-停用 */
private Integer status;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
View File

@ -102,10 +102,7 @@ public class EmisQuotePrice extends BaseEntity
private Date endDate;
/* 优先级 */
private Integer priorityLevel;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
// 扩展VO
private String useSiteName;

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisRegion.java
View File

@ -59,9 +59,6 @@ public class EmisRegion extends BaseEntity
private String zipCode;
/* 显示顺序 */
private Integer orderNum;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
View File

@ -269,10 +269,7 @@ public class EmisSite extends BaseEntity
private String incrementService;
/* 是否允许仓库收货 */
private String blWarehouseIn;
/* 创建网点 */
private String createSite;
/* 更新网点 */
private String updateSite;
private String logoTypeName;

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

@ -243,13 +243,13 @@ public class WaybillOrder implements Serializable {
/* 是否生成子单 1-是 0-否 */
private String blGenSubbill;
private String receiveCountryName;
private String receiveProvinceName;
private String receiveCityName;
private String sendCountryName;
private String sendProvinceName;
private String sendCityName;
// private String receiveCountryName;
// private String receiveProvinceName;
// private String receiveCityName;
//
// private String sendCountryName;
// private String sendProvinceName;
// private String sendCityName;
private String transLineTypeName;
private String productTypeName;
@ -396,40 +396,8 @@ public class WaybillOrder implements Serializable {
// voItem.setPayeeName(dbWaybill.getPayeeName());
// voItem.setReceiveCustomerCode(dbWaybill.getReceiveCustomerCode());
// voItem.setReceiveCustomerName(dbWaybill.getReceiveCustomerName());
// voItem.setThirdCustomerCode(dbWaybill.getThirdCustomerCode());
// voItem.setThirdCustomerName(dbWaybill.getThirdCustomerName());
voItem.setOpenId(dbWaybill.getOpenId());
// voItem.setReceiveName(dbWaybill.getReceiveName());
// voItem.setReceiveCompany(dbWaybill.getReceiveCompany());
// voItem.setReceiveMobile(dbWaybill.getReceiveMobile());
// voItem.setReceiveTel(dbWaybill.getReceiveTel());
// voItem.setReceiveCountry(dbWaybill.getReceiveCountry());
// voItem.setReceiveProvince(dbWaybill.getReceiveProvince());
// voItem.setReceiveCity(dbWaybill.getReceiveCity());
// voItem.setReceiveCounty(dbWaybill.getReceiveCounty());
// voItem.setReceiveTown(dbWaybill.getReceiveTown());
// voItem.setReceiveAddress(dbWaybill.getReceiveAddress());
// voItem.setReceivePostcode(dbWaybill.getReceivePostcode());
// voItem.setReceivePcd(dbWaybill.getReceivePcd());
// voItem.setSendName(dbWaybill.getSendName());
// voItem.setSendCompany(dbWaybill.getSendCompany());
// voItem.setSendMobile(dbWaybill.getSendMobile());
// voItem.setSendTel(dbWaybill.getSendTel());
// voItem.setSendCountry(dbWaybill.getSendCountry());
// voItem.setSendProvince(dbWaybill.getSendProvince());
// voItem.setSendCity(dbWaybill.getSendCity());
// voItem.setSendCounty(dbWaybill.getSendCounty());
// voItem.setSendTown(dbWaybill.getSendTown());
// voItem.setSendAddress(dbWaybill.getSendAddress());
// voItem.setSendPostcode(dbWaybill.getSendPostcode());
// voItem.setSendPcd(dbWaybill.getSendPcd());
voItem.setPaymentType(dbWaybill.getPaymentType());
voItem.setCalcFeeType(dbWaybill.getCalcFeeType());
voItem.setCustNo(dbWaybill.getCustNo());
@ -451,6 +419,9 @@ public class WaybillOrder implements Serializable {
voItem.setPickStartDate(dbWaybill.getPickStartDate());
voItem.setPickFinishDate(dbWaybill.getPickFinishDate());
voItem.setTransLineTypeName(dbWaybill.getTransLineTypeName());
voItem.setProductTypeName(dbWaybill.getProductTypeName());
// voItem.setPickFailReason(dbWaybill.getPickFailReason());
voItem.setIntoWarehouseCode(dbWaybill.getIntoWarehouseCode());

9
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCountryMapper.java
View File

@ -25,15 +25,6 @@ import org.apache.ibatis.annotations.Select;
public interface EmisCountryMapper extends BaseMapper<EmisCountry>
{
@Select("select count(1) from emis_country where name=${name} or name_en=${nameEn} or code ")
public int checkCountryIsExists(@Param("name") String name,
@Param("nameEn") String nameEn,
@Param("code") String code,
@Param("two_code") String twoCode,
@Param("three_code") String threeCode
);
/**
* 主键查询
* @param id

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCountryServiceImpl.java
View File

@ -65,10 +65,10 @@ public class EmisCountryServiceImpl implements IEmisCountryService
*/
@Override
public int insertEmisCountry(EmisCountry emisCountry) throws EmisBizError {
int cnt=emisCountryMapper.checkCountryIsExists(emisCountry.getName(),emisCountry.getNameEn(),emisCountry.getCode(),emisCountry.getTwoCode(),emisCountry.getThreeCode());
if(cnt>0){
throw new EmisBizError(EmisBizErrorType.FAIL,"国家信息不能重复，请检查！");
}
// int cnt=emisCountryMapper.checkCountryIsExists(emisCountry.getName(),emisCountry.getNameEn(),emisCountry.getCode(),emisCountry.getTwoCode(),emisCountry.getThreeCode());
// if(cnt>0){
// throw new EmisBizError(EmisBizErrorType.FAIL,"国家信息不能重复，请检查！");
// }
return emisCountryMapper.insertEmisCountry(emisCountry);
}