|
|
@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.alibaba.fastjson2.JSONWriter;
|
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
@@ -29,7 +28,6 @@ import com.fjhx.sale.entity.documents.po.DocumentsTransport;
|
|
|
import com.fjhx.sale.entity.documents.vo.DocumentsVo;
|
|
|
import com.fjhx.sale.entity.pack.po.PackDetail;
|
|
|
import com.fjhx.sale.entity.pack.po.PackDetailGoods;
|
|
|
-import com.fjhx.sale.entity.pack.po.PackDetailProduct;
|
|
|
import com.fjhx.sale.entity.pack.po.PackShipment;
|
|
|
import com.fjhx.sale.mapper.documents.DocumentsMapper;
|
|
|
import com.fjhx.sale.service.contract.ContractProjectService;
|
|
|
@@ -393,6 +391,8 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
|
|
|
JSONObject object = new JSONObject();
|
|
|
// 项号
|
|
|
object.put("num", num);
|
|
|
+ //产品id
|
|
|
+ object.put("productId", product.getProductId());
|
|
|
// 商品编号(13位)原10位海关编码+3位检验检疫附加编码
|
|
|
object.put("customsCode", product.getCustomsCode());
|
|
|
// 商品名称
|
yzc