|
|
|
@ -10,9 +10,8 @@ import com.alibaba.fastjson2.JSONArray;
|
|
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
|
|
import com.op.common.core.utils.uuid.IdUtils;
|
|
|
|
|
import com.op.common.security.utils.SecurityUtils;
|
|
|
|
|
import com.op.wms.domain.OdsProcureOrder;
|
|
|
|
|
import com.op.wms.domain.OdsProcureOutOrder;
|
|
|
|
|
import com.op.wms.domain.WmsOdsMateStorageNews;
|
|
|
|
|
import com.op.wms.domain.*;
|
|
|
|
|
import com.op.wms.mapper.BaseProductAttachedMapper;
|
|
|
|
|
import com.op.wms.mapper.OdsProcureOrderMapper;
|
|
|
|
|
import com.op.wms.mapper.WmsOdsMateStorageNewsMapper;
|
|
|
|
|
import okhttp3.*;
|
|
|
|
@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
|
|
|
|
|
import com.op.wms.domain.WmsOdsMateStorageNewsSn;
|
|
|
|
|
import com.op.wms.service.IWmsOdsMateStorageNewsSnService;
|
|
|
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
|
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
|
@ -45,6 +43,9 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
|
|
|
|
|
private OdsProcureOrderMapper odsProcureOrderMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private WmsOdsMateStorageNewsMapper wmsOdsMateStorageNewsMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private BaseProductAttachedMapper baseProductAttachedMapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询包材库存明细表
|
|
|
|
|
*
|
|
|
|
@ -168,7 +169,29 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
|
|
|
|
|
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
|
|
|
|
|
for (OdsProcureOutOrder order:
|
|
|
|
|
orderList) {
|
|
|
|
|
//入参是物料,仓库,库区,数量,生成标识卡,
|
|
|
|
|
//不需要前端传仓库和库区
|
|
|
|
|
BaseProductAttached baseProductAttached=new BaseProductAttached();
|
|
|
|
|
String trimmedMaterialCode = order.getMaterialCode().substring(7);
|
|
|
|
|
baseProductAttached.setProductCode(trimmedMaterialCode);
|
|
|
|
|
List<BaseProductAttached> baseProductAttacheds= baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached);
|
|
|
|
|
if (baseProductAttacheds.size()==0){
|
|
|
|
|
//没有配置附属信息
|
|
|
|
|
return "没有配置附属信息";
|
|
|
|
|
}
|
|
|
|
|
String waCode1 = baseProductAttacheds.get(0).getWaCode();
|
|
|
|
|
if (waCode1==null|| waCode1.isEmpty()){
|
|
|
|
|
//没有配置附属信息
|
|
|
|
|
return "没有配置库区";
|
|
|
|
|
}
|
|
|
|
|
// BaseArea baseArea=new BaseArea();
|
|
|
|
|
// baseArea.setAreaCode(baseProductAttacheds.get(0).getWaCode());
|
|
|
|
|
//根据库区查询仓库
|
|
|
|
|
String whCode= baseProductAttachedMapper.selectBaseAreaListnew(waCode1);
|
|
|
|
|
if (whCode==null){
|
|
|
|
|
//没有配置附属信息
|
|
|
|
|
return "库区配置错误,查询不到对应仓库";
|
|
|
|
|
}
|
|
|
|
|
//入参是物料,仓库,库区,数量,生成标识卡,
|
|
|
|
|
String BC= wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnBC(order);
|
|
|
|
|
List<OdsProcureOrder> dtos0=new ArrayList<>();
|
|
|
|
|
String setid=IdUtils.fastSimpleUUID();//
|
|
|
|
@ -197,7 +220,6 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
|
|
|
|
|
odsProcureOrder.setActive("1");
|
|
|
|
|
dtos0.add(odsProcureOrder);
|
|
|
|
|
odsProcureOrderMapper.addBatchPallet(dtos0);
|
|
|
|
|
|
|
|
|
|
WmsOdsMateStorageNews wmsOdsMateStorageNews3 = new WmsOdsMateStorageNews();
|
|
|
|
|
wmsOdsMateStorageNews3.setStorageId(IdUtils.fastSimpleUUID());
|
|
|
|
|
wmsOdsMateStorageNews3.setWhCode(order.getLocCode());
|
|
|
|
@ -214,7 +236,7 @@ public class WmsOdsMateStorageNewsSnServiceImpl implements IWmsOdsMateStorageNew
|
|
|
|
|
wmsOdsMateStorageNews3.setFactoryCode(factoryCode);
|
|
|
|
|
wmsOdsMateStorageNews3.setSapFactoryCode(factoryCode);
|
|
|
|
|
wmsOdsMateStorageNews3.setUserDefined1(order.getUnit());//单位
|
|
|
|
|
wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews3);
|
|
|
|
|
// wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews3);
|
|
|
|
|
WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn();
|
|
|
|
|
wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID());
|
|
|
|
|
wmsOdsMateStorageNewsSn.setWhCode(order.getLocCode());//仓库编码
|
|
|
|
|