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 2025-01-06 11:05:16 +08:00
parent 78adc075b1
commit a1ac74cba0
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
View File

@ -11,6 +11,7 @@
package com.xdadan.erp.emis.domain; package com.xdadan.erp.emis.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
@ -74,9 +75,17 @@ public class EmisWarehouseIn extends BaseEntity
private BigDecimal totalVolume; private BigDecimal totalVolume;
/* 总重量 */ /* 总重量 */
private BigDecimal totalWeight; private BigDecimal totalWeight;
// --------- 扩展参数
// --------- 扩展参数
private EmisWaybill waybillDetail; private EmisWaybill waybillDetail;
// 是否已锁单 T,锁单原因
@TableField(exist = false)
private String lockFlag;
@TableField(exist = false)
private String lockReason;
// 入仓批次信息 // 入仓批次信息
private List<EmisWarehouseInBatch> stockInBatchList; private List<EmisWarehouseInBatch> stockInBatchList;
} }

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
View File

@ -53,6 +53,7 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo) public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
{ {
EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo); EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
if(emisWarehouseIn!=null){ if(emisWarehouseIn!=null){
List<EmisWarehouseInBatch> stockInBatchList= emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo); List<EmisWarehouseInBatch> stockInBatchList= emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo);
emisWarehouseIn.setStockInBatchList(stockInBatchList); emisWarehouseIn.setStockInBatchList(stockInBatchList);

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

@ -1983,6 +1983,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
String orderSn = WaybillHelper.genOrderSn(); String orderSn = WaybillHelper.genOrderSn();
// 订单号 // 订单号
// 新开单历史数据要清除，避免上一单脏数据带过来
if(isNew) { if(isNew) {
emisWaybillSave.setOrderSn(orderSn); emisWaybillSave.setOrderSn(orderSn);
} }
@ -2952,6 +2953,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setOrderType("0"); emisWaybillSave.setOrderType("0");
emisWaybillSave.setOrderDate(new Date()); emisWaybillSave.setOrderDate(new Date());
// 新开单清除费用备注，录单备注
emisWaybillSave.setRemark(null);
emisWaybillSave.setFeeRemark(null);
// 如果是孟加拉单子，把运单号变为 12位 // 如果是孟加拉单子，把运单号变为 12位
if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){ if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){
if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){ if(emisWaybillSave.getBillCode().length()==14 && emisWaybillSave.getBillCode().startsWith("T7080")){