Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7ef923b9e0
|
|
@ -31,6 +31,7 @@ import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
|
||||||
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
|
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
|
||||||
import com.nu.utils.DictUtils;
|
import com.nu.utils.DictUtils;
|
||||||
import io.swagger.models.auth.In;
|
import io.swagger.models.auth.In;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
|
@ -58,6 +59,7 @@ import java.util.*;
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
@Slf4j
|
||||||
public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMainMapper, NuInvoicingCgdMain> implements INuInvoicingCgdMainService, IInvoicingApi {
|
public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMainMapper, NuInvoicingCgdMain> implements INuInvoicingCgdMainService, IInvoicingApi {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
|
|
@ -449,6 +451,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
||||||
cgdMain.setCgdNo(cgdNo);
|
cgdMain.setCgdNo(cgdNo);
|
||||||
cgdMain.setIzNew("Y");
|
cgdMain.setIzNew("Y");
|
||||||
List<NuInvoicingCgdInfo> cgdInfoList = cgdMain.getCgdInfoList();
|
List<NuInvoicingCgdInfo> cgdInfoList = cgdMain.getCgdInfoList();
|
||||||
|
cgdMainMapper.insert(cgdMain);
|
||||||
for (NuInvoicingCgdInfo cgdInfo : cgdInfoList){
|
for (NuInvoicingCgdInfo cgdInfo : cgdInfoList){
|
||||||
cgdInfo.setCgdId(cgdMain.getId());
|
cgdInfo.setCgdId(cgdMain.getId());
|
||||||
|
|
||||||
|
|
@ -456,12 +459,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
||||||
queryWrapper.eq("wl_id",cgdInfo.getWlId());
|
queryWrapper.eq("wl_id",cgdInfo.getWlId());
|
||||||
queryWrapper.eq("suppliers_id",cgdInfo.getSuppliersId());
|
queryWrapper.eq("suppliers_id",cgdInfo.getSuppliersId());
|
||||||
List<QgdInfo> qgdInfoList =qgdInfoMapper.selectList(queryWrapper);
|
List<QgdInfo> qgdInfoList =qgdInfoMapper.selectList(queryWrapper);
|
||||||
if(qgdInfoList == null || qgdInfoList.size() > 1){
|
log.info("------------qgdInfoList--------1-----"+qgdInfoList.size());
|
||||||
throw new RuntimeException("购物车数据不是最新的,请重新查询后再进行请购");
|
if(qgdInfoList == null || qgdInfoList.size() == 0){
|
||||||
|
log.info("------------qgdInfoList----2---------");
|
||||||
|
throw new IllegalArgumentException("购物车数据不是最新的,请重新查询后再进行请购");
|
||||||
}
|
}
|
||||||
cgdInfoMapper.insert(cgdInfo);
|
cgdInfoMapper.insert(cgdInfo);
|
||||||
}
|
}
|
||||||
cgdMainMapper.insert(cgdMain);
|
|
||||||
String qgdId = cgdMain.getQgdId();
|
String qgdId = cgdMain.getQgdId();
|
||||||
for(String id : qgdId.split(",")){
|
for(String id : qgdId.split(",")){
|
||||||
qgdInfoMapper.deleteById(id);
|
qgdInfoMapper.deleteById(id);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue