root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:1.入库接口推送需增加料框明细表，入库单据根据载具号自动合成一个单据；2.手持组盘按明细组盘，入库显示料框明细；

Browse Source
This commit is contained in:
zhengxuming
2025-08-22 10:49:33 +08:00
parent 4e16d09948
commit 6091019bba
18 changed files with 51300 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.basedata_manage.controller;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.RequiredArgsConstructor;
@@ -15,15 +16,22 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateDtlService;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -44,6 +52,10 @@ public class GroupController {
@Autowired
private final IMdPbGroupplateService iMdPbGroupplateService;
@Autowired
private final IMdPbGroupplateDtlService iMdPbGroupplateDtlService;
@Autowired
private final IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService;
@@ -56,8 +68,9 @@ public class GroupController {
@PostMapping
@Log("新增组盘组盘")
@Transactional
public ResponseEntity<Object> create(@RequestBody JSONObject group) {
Assert.noNullElements(new Object[]{group,group.get("material_id"),group.get("storagevehicle_code"),group.get("qty")},"请求参数不能为空");
Assert.noNullElements(new Object[]{group,group.get("material_id"),group.get("storagevehicle_code"),group.get("qty"),group.get("dtlList")},"请求参数不能为空");
GroupPlate groupPlate = group.toJavaObject(GroupPlate.class);
String storagevehicleCode = groupPlate.getStoragevehicle_code();
{
@@ -74,7 +87,24 @@ public class GroupController {
groupPlate.setCreate_name(SecurityUtils.getCurrentUsername());
groupPlate.setCreate_time(DateUtil.now());
groupPlate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("组盘"));
List<GroupPlateDtl> groupPlateDtlList = new ArrayList<>();
JSONArray dtlList = group.getJSONArray("dtlList");
BigDecimal qty = new BigDecimal("0");
for (int i = 0; i < dtlList.size(); i++) {
JSONObject row = dtlList.getJSONObject(i);
GroupPlateDtl groupPlateDtl = new GroupPlateDtl();
BeanUtils.copyProperties(groupPlate,groupPlateDtl);
groupPlateDtl.setGroupdtl_id(IdUtil.getStringId());
groupPlateDtl.setMater_frame(row.getString("mater_frame"));
groupPlateDtl.setQty(row.getBigDecimal("qty"));
groupPlateDtlList.add(groupPlateDtl);
qty = qty.add(row.getBigDecimal("qty"));
}
groupPlate.setQty(qty);
iMdPbGroupplateService.save(groupPlate);
iMdPbGroupplateDtlService.saveBatch(groupPlateDtlList);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -84,4 +114,9 @@ public class GroupController {
iMdPbGroupplateService.delete(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/getdtl/{id}")
public ResponseEntity<Object> getdtl(@PathVariable String id) {
return new ResponseEntity<>(iMdPbGroupplateService.getdtl(id), HttpStatus.OK);
}
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java
View File

@@ -42,7 +42,7 @@ public class BigScreenController {
@SaIgnore
public ResponseEntity<Object> getData(@RequestBody JSONObject stors) {
List<String> list = new ArrayList<>();
list.add("GW");
list.add("FJ");
List<JSONObject> data = bigScreenService.getData(list);
return new ResponseEntity<>(PdaResponse.requestParamOk(data.get(0)), HttpStatus.OK);
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java
View File

@@ -59,7 +59,7 @@ public class BigScreenServiceImpl implements BigScreenService {
@Override
public List<JSONObject> getData(List<String> stors) {
// String storCode = "GW";
// String storCode = "FJ";
List result = new ArrayList<>();
if (CollectionUtils.isEmpty(stors)){
return result;

7
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/ErpToWmsController.java
View File

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.ext_manage.dto.ErpGroupplateDto;
import org.nl.wms.ext_manage.service.ErpToWmsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* ERP调用WMS 控制层
@@ -35,8 +38,8 @@ public class ErpToWmsController {
@PostMapping("/groupinfo")
@Log("下发组盘信息")
@SaIgnore
public ResponseEntity<Object> sendGroupplate(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(erpToWmsService.sendGroupplate(whereJson),HttpStatus.OK);
public ResponseEntity<Object> sendGroupplate(@RequestBody List<ErpGroupplateDto> dto) {
return new ResponseEntity<>(erpToWmsService.sendGroupplate(dto),HttpStatus.OK);
}
@PostMapping("/usematerinfo")

17
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/dto/ErpGroupplateDto.java Normal file
View File

@@ -0,0 +1,17 @@
package org.nl.wms.ext_manage.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ErpGroupplateDto {
private String order_code;
private String order_type;
private String pallet_sn;
private String mater_frame;
private String mater_code;
private String mater_name;
private String unit_code;
private BigDecimal qty;
}

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/ErpToWmsService.java
View File

@@ -1,8 +1,11 @@
package org.nl.wms.ext_manage.service;
import com.alibaba.fastjson.JSONObject;
import org.nl.wms.ext_manage.dto.ErpGroupplateDto;
import org.nl.wms.ext_manage.service.util.ErpResponse;
import java.util.List;
/**
* <p>
* ERP调用WMS 服务类
@@ -32,7 +35,7 @@ public interface ErpToWmsService {
* }
* @return ErpResponse
*/
ErpResponse sendGroupplate(JSONObject whereJson);
ErpResponse sendGroupplate(List<ErpGroupplateDto> dto);
/**
* 下发用料信息

148
nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.ext_manage.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,19 +13,25 @@ import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.ext_manage.dto.ErpGroupplateDto;
import org.nl.wms.ext_manage.service.ErpToWmsService;
import org.nl.wms.ext_manage.service.util.ErpResponse;
import org.nl.wms.pm_manage.service.IPmFormDataService;
import org.nl.wms.pm_manage.service.dao.PmFormData;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateDtlService;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateDtlMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -50,6 +57,9 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
@Autowired
private IMdPbGroupplateService iMdPbGroupplateService;
@Autowired
private IMdPbGroupplateDtlService iMdPbGroupplateDtlService;
/**
* 物料基础数据服务
*/
@@ -63,8 +73,9 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
private IMdPbMeasureunitService iMdPbMeasureunitService;
@Transactional
@Override
public ErpResponse sendGroupplate(JSONObject whereJson) {
public ErpResponse sendGroupplate(List<ErpGroupplateDto> dto) {
//todo 需要测试，JSONObject whereJson改成 json数组
/**
* {
@@ -78,80 +89,171 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
* "qty": "120.00"
* }
*/
log.info("sendGroupplate下发组盘接口输入参数为：-------------------" + whereJson.toString());
log.info("sendGroupplate下发组盘接口输入参数为：-------------------" + JSONObject.toJSONString(dto));
// 查询仓库
BsrealStorattr storDao = iBsrealStorattrService.findByCode("GW");
BsrealStorattr storDao = iBsrealStorattrService.findByCode("FJ");
if (storDao == null) {
throw new BadRequestException("仓库不存在");
}
// 组织明细
List<JSONObject> dataList = whereJson.getJSONArray("data").toJavaList(JSONObject.class);
// 查询所有物料
List<MdMeMaterialbase> materDaoList = iMdMeMaterialbaseService.list(
new QueryWrapper<MdMeMaterialbase>().lambda()
.in(MdMeMaterialbase::getMaterial_code, dataList.stream()
.map(row -> row.getString("mater_code"))
.in(MdMeMaterialbase::getMaterial_code, dto.stream()
.map(ErpGroupplateDto::getMater_code)
.collect(Collectors.toList())
)
);
if(CollectionUtil.isEmpty(materDaoList)){
throw new BadRequestException("物料编码不存在");
}
// 查询所有计量单位
List<MdPbMeasureunit> unitDaoList = iMdPbMeasureunitService.list(
new QueryWrapper<MdPbMeasureunit>().lambda()
.in(MdPbMeasureunit::getUnit_code, dataList.stream()
.map(row -> row.getString("unit_code"))
.in(MdPbMeasureunit::getUnit_name, dto.stream()
.map(ErpGroupplateDto::getUnit_code)
.collect(Collectors.toList()))
);
// 明细集合
List<PmFormData> dtlArr = new ArrayList<>();
// 明细集合
List<GroupPlate> plates = new ArrayList<>();
for (JSONObject json : dataList) {
List<GroupPlateDtl> plateDtls = new ArrayList<>();
//将list通过托盘号进行分组
Map<String, List<ErpGroupplateDto>> dtoByPallet = dto.stream().collect(Collectors.groupingBy(ErpGroupplateDto::getPallet_sn));
dtoByPallet.forEach((key,value)->{
PmFormData jsonDtl = new PmFormData();
MdMeMaterialbase materDao = materDaoList.stream()
.filter(row -> row.getMaterial_code().equals(json.getString("mater_code")))
.filter(row -> row.getMaterial_code().equals(value.get(0).getMater_code()))
.findFirst().orElse(null);
jsonDtl.setId(IdUtil.getStringId());
jsonDtl.setCode(json.getString("order_code"));
jsonDtl.setStatus(IOSEnum.BILL_STATUS.code("生成"));
jsonDtl.setStor_id(storDao.getStor_id());
jsonDtl.setStor_name(storDao.getStor_name());
jsonDtl.setForm_type("0001");
jsonDtl.setSource_form_date(DateUtil.today());
jsonDtl.setMaterial_code(json.getString("mater_code"));
jsonDtl.setMaterial_code(value.get(0).getMater_code());
jsonDtl.setMaterial_id(materDao.getMaterial_id());
jsonDtl.setQty(BigDecimal.valueOf(json.getDoubleValue("qty")));
jsonDtl.setPlan_qty(BigDecimal.valueOf(json.getDoubleValue("qty")));
MdPbMeasureunit unitDao = unitDaoList.stream()
.filter(row -> row.getUnit_code().equals(json.getString("unit_code")))
.filter(row -> row.getUnit_name().equals(value.get(0).getUnit_code()))
.findFirst().orElse(null);
jsonDtl.setUnit_id(unitDao.getMeasure_unit_id());
jsonDtl.setUnit_name(unitDao.getUnit_name());
jsonDtl.setVehicle_code(json.getString("pallet_sn"));
jsonDtl.setVehicle_code2(json.getString("mater_frame"));
jsonDtl.setVehicle_code(value.get(0).getPallet_sn());
jsonDtl.setVehicle_code2(value.get(0).getMater_frame());
jsonDtl.setCreate_name("ERP");
jsonDtl.setCreate_time(DateUtil.now());
//单据编号使用合单号
jsonDtl.setCode("H-"+value.get(0).getOrder_code());
jsonDtl.setNew_merge_flag("1");
StringBuilder mergeCodes = new StringBuilder();
BigDecimal qty = new BigDecimal("0");
for(ErpGroupplateDto groupplateDto:value){
PmFormData jsonDtl2 = new PmFormData();
MdMeMaterialbase materDaoDtl = materDaoList.stream()
.filter(row -> row.getMaterial_code().equals(groupplateDto.getMater_code()))
.findFirst().orElse(null);
jsonDtl2.setId(IdUtil.getStringId());
jsonDtl2.setStatus(IOSEnum.BILL_STATUS.code("生成"));
jsonDtl2.setStor_id(storDao.getStor_id());
jsonDtl2.setStor_name(storDao.getStor_name());
jsonDtl2.setForm_type("0001");
jsonDtl2.setSource_form_date(DateUtil.today());
jsonDtl2.setMaterial_code(groupplateDto.getMater_code());
jsonDtl2.setMaterial_id(materDaoDtl.getMaterial_id());
jsonDtl2.setQty(groupplateDto.getQty());
jsonDtl2.setPlan_qty(groupplateDto.getQty());
MdPbMeasureunit unitDaoDtl = unitDaoList.stream()
.filter(row -> row.getUnit_name().equals(groupplateDto.getUnit_code()))
.findFirst().orElse(null);
jsonDtl2.setUnit_id(unitDaoDtl.getMeasure_unit_id());
jsonDtl2.setUnit_name(unitDaoDtl.getUnit_name());
jsonDtl2.setVehicle_code(groupplateDto.getPallet_sn());
jsonDtl2.setVehicle_code2(groupplateDto.getMater_frame());
jsonDtl2.setCreate_name("ERP");
jsonDtl2.setCreate_time(DateUtil.now());
jsonDtl2.setCode(groupplateDto.getOrder_code());
jsonDtl2.setNew_merge_flag("0");
jsonDtl2.setIs_merge("1");
dtlArr.add(jsonDtl2);
mergeCodes.append(groupplateDto.getOrder_code()).append(",");
qty = qty.add(groupplateDto.getQty());
}
if(mergeCodes.length()>0){
mergeCodes.deleteCharAt(mergeCodes.length() - 1);
}
jsonDtl.setMerge_codes(mergeCodes.toString());
jsonDtl.setQty(qty);
jsonDtl.setPlan_qty(qty);
dtlArr.add(jsonDtl);
GroupPlate plate = new GroupPlate();
plate.setGroup_id(IdUtil.getStringId());
plate.setStoragevehicle_code(json.getString("pallet_sn"));
for(ErpGroupplateDto groupplateDto:value) {
MdMeMaterialbase materDaoDtl = materDaoList.stream()
.filter(row -> row.getMaterial_code().equals(groupplateDto.getMater_code()))
.findFirst().orElse(null);
MdPbMeasureunit unitDaoDtl = unitDaoList.stream()
.filter(row -> row.getUnit_name().equals(groupplateDto.getUnit_code()))
.findFirst().orElse(null);
GroupPlateDtl plate2 = new GroupPlateDtl();
plate2.setGroup_id(plate.getGroup_id());
plate2.setGroupdtl_id(IdUtil.getStringId());
plate2.setStoragevehicle_code(groupplateDto.getPallet_sn());
plate2.setMaterial_id(materDaoDtl.getMaterial_id());
plate2.setQty_unit_id(unitDaoDtl.getMeasure_unit_id());
plate2.setQty_unit_name(unitDaoDtl.getUnit_name());
plate2.setQty(groupplateDto.getQty());
plate2.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("生成"));
plate2.setExt_code(jsonDtl.getCode());
plate2.setExt_type("0001");
plate2.setExt_id(jsonDtl.getId());
plate2.setMater_frame(groupplateDto.getMater_frame());
plate2.setCreate_name("ERP");
plate2.setCreate_time(DateUtil.now());
plate2.setCreate_id("ERP");
plateDtls.add(plate2);
}
plate.setStoragevehicle_code(value.get(0).getPallet_sn());
plate.setMaterial_id(materDao.getMaterial_id());
plate.setQty_unit_id(unitDao.getMeasure_unit_id());
plate.setQty_unit_name(unitDao.getUnit_name());
plate.setQty(BigDecimal.valueOf(json.getDoubleValue("qty")));
plate.setQty(qty);
plate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("生成"));
plate.setExt_code(json.getString("order_code"));
plate.setExt_code("H-"+value.get(0).getOrder_code());
plate.setExt_type("0001");
plate.setExt_id(jsonDtl.getId());
plate.setCreate_name("ERP");
plate.setCreate_time(DateUtil.now());
plate.setCreate_id("ERP");
plates.add(plate);
}
});
//保存组盘记录到单据表
iPmFormDataService.saveBatch(dtlArr);
//保存组盘记录到组盘表
iMdPbGroupplateService.saveBatch(plates);
//保存组盘明细
iMdPbGroupplateDtlService.saveBatch(plateDtls);
log.info("sendGroupplate下发组盘接口输出参数为：-------------------" + ErpResponse.requestOk().toString());
return ErpResponse.requestOk();
}
@@ -174,7 +276,7 @@ public class ErpToWmsServiceImpl implements ErpToWmsService {
*/
log.info("usematerinfo接口输入参数为：-------------------" + whereJson.toString());
// 查询仓库
BsrealStorattr storDao = iBsrealStorattrService.findByCode("GW");
BsrealStorattr storDao = iBsrealStorattrService.findByCode("FJ");
if (storDao == null) {
throw new BadRequestException("仓库不存在");
}

24
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IMdPbGroupplateDtlService.java Normal file
View File

@@ -0,0 +1,24 @@
package org.nl.wms.warehouse_manage.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* <p>
* 组盘明细
* </p>
*
* @author zhengxuming
* @since 2025年8月21日10:39:19
*/
public interface IMdPbGroupplateDtlService extends IService<GroupPlateDtl> {
}

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IMdPbGroupplateService.java
View File

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.pm_manage.service.dao.PmFormData;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import java.util.List;
import java.util.Map;
@@ -48,4 +50,7 @@ public interface IMdPbGroupplateService extends IService<GroupPlate> {
* }
*/
void updateIvt(List<JSONObject> updateIvtList);
List<GroupPlateDtl> getdtl(String group_id);
}

33
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/MdPbGroupplateServiceDtlImpl.java Normal file
View File

@@ -0,0 +1,33 @@
package org.nl.wms.warehouse_manage.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateDtlService;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateDtlMapper;
import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* <p>
* 组盘记录表 服务实现类
* </p>
*
* @author Liuxy
* @since 2025-05-23
*/
@Service
public class MdPbGroupplateServiceDtlImpl extends ServiceImpl<MdPbGroupplateDtlMapper, GroupPlateDtl> implements IMdPbGroupplateDtlService {
}

38
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/MdPbGroupplateServiceImpl.java
View File

@@ -1,21 +1,32 @@
package org.nl.wms.warehouse_manage.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.basedata_manage.service.dao.BsrealStorattr;
import org.nl.wms.pm_manage.service.dao.PmFormData;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateDtlService;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.nl.wms.warehouse_manage.service.dao.GroupPlateDtl;
import org.nl.wms.warehouse_manage.service.dao.mapper.MdPbGroupplateMapper;
import org.nl.wms.warehouse_manage.service.util.UpdateIvtUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/**
* <p>
@@ -33,6 +44,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
@Autowired
private UpdateIvtUtils updateIvtUtils;
/**
* 更新库存工具类
*/
@Autowired
private IMdPbGroupplateDtlService iMdPbGroupplateDtlService;
@Override
public IPage<JSONObject> queryAll(Map whereJson, PageQuery page) {
return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()),
@@ -42,6 +59,16 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
@Override
@Transactional
public void delete(Set<String> ids) {
//通过ids 查询到子表的ids
List<GroupPlateDtl> groupPlateDtlList = iMdPbGroupplateDtlService.list(new LambdaQueryWrapper<>(GroupPlateDtl.class)
.in(GroupPlateDtl::getGroup_id, ids));
if (CollectionUtils.isNotEmpty(groupPlateDtlList)) {
//删除子表
Set<String> dtlIds = groupPlateDtlList.stream().map(GroupPlateDtl::getGroupdtl_id).collect(Collectors.toSet());
iMdPbGroupplateDtlService.removeByIds(dtlIds);
}
this.baseMapper.deleteBatchIds(ids);
}
@@ -65,4 +92,15 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl<MdPbGroupplateMapper,
updateIvtUtils.updateIvt(json);
}
}
@Override
public List<GroupPlateDtl> getdtl(String group_id) {
if (StringUtils.isEmpty(group_id)) {
throw new BadRequestException("请求参数不能为空");
}
List<GroupPlateDtl> dtlList = iMdPbGroupplateDtlService.list(new LambdaQueryWrapper<>(GroupPlateDtl.class)
.eq(GroupPlateDtl::getGroup_id, group_id));
return dtlList;
}
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -790,7 +790,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
JSONObject form = new JSONObject();
// 查询仓库
BsrealStorattr storDao = iBsrealStorattrService.findByCode("GW");
BsrealStorattr storDao = iBsrealStorattrService.findByCode("FJ");
form.put("stor_id",storDao.getStor_id());
form.put("bill_type",IOSEnum.BILL_TYPE.code("生产入库"));
form.put("biz_date",DateUtil.now());

2
nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -9,7 +9,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms_fujia}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:2306}/${DB_NAME:fujia}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
# url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}