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-04-28 09:06:55 +08:00
parent 2702822887
commit 3a3dfb617c
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -19,12 +19,14 @@ import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Singleton; import cn.hutool.core.lang.Singleton;
import cn.hutool.core.lang.Snowflake; import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.xdadan.erp.common.utils.DBUtil; import com.xdadan.erp.common.utils.DBUtil;
import com.xdadan.erp.emis.domain.EmisWaybillAttachment; import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
import com.xdadan.erp.emis.domain.EmisWaybillCargo; import com.xdadan.erp.emis.domain.EmisWaybillCargo;
import com.xdadan.erp.emis.domain.EmisWaybillFeeitem; import com.xdadan.erp.emis.domain.EmisWaybillFeeitem;
import com.xdadan.erp.emis.domain.vo.*; import com.xdadan.erp.emis.domain.vo.*;
import com.xdadan.erp.emis.service.*; import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -163,6 +165,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
} }
} }
@Override @Override
public WaybillOrder getWaybillDetail(String billCode){ public WaybillOrder getWaybillDetail(String billCode){
@ -233,10 +236,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
// 新增 // 新增
if(isNew){ if(isNew){
// 设置订单 String orderSn = WaybillHelper.genOrderSn();
Snowflake snowflake = Singleton.get(Snowflake.class, 1, 1, true);
Long orderId = snowflake.nextId();
String orderSn = "TAO" + orderId.toString();
emisWaybillNew.setOrderSn(orderSn); emisWaybillNew.setOrderSn(orderSn);
emisWaybillMapper.insertEmisWaybill(emisWaybillNew); emisWaybillMapper.insertEmisWaybill(emisWaybillNew);
@ -286,16 +286,11 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
public static void main(String[] args) { public static void main(String[] args) {
// EmisWaybill emisWaybill =new EmisWaybill(); Snowflake snowflake = IdUtil.getSnowflake(0, 0);
// emisWaybill.setBillCode("T123123"); Long orderId = snowflake.nextId();
// String orderSn = "TO" + orderId.toString();
// // 忽略复制过程中出现的错误 System.out.println(orderSn);
// CopyOptions options = CopyOptions.create().setIgnoreError(true);
//
// // 基础信息
// BeanUtil.copyProperties(emisWaybill,waybillOrder,options);
//
// System.out.println(waybillOrder.toString());
} }

13
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java Normal file
View File

@ -0,0 +1,13 @@
package com.xdadan.erp.emis.utils;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
public class WaybillHelper {
public static String genOrderSn(){
Snowflake snowflake = IdUtil.getSnowflake(0, 0);
Long orderId = snowflake.nextId();
return "TAO" + orderId.toString();
}
}