diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPublicInterfaceController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPublicInterfaceController.java index 73a8745..37cb27c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPublicInterfaceController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPublicInterfaceController.java @@ -39,6 +39,13 @@ public class PdaPublicInterfaceController { return new ResponseEntity<>(pdaUpdatePointService.queryMaterInfo(whereJson), HttpStatus.OK); } + @PostMapping("/querySupp") + @Log("查询供应商") + @SaIgnore + public ResponseEntity querySupp(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaUpdatePointService.querySupp(whereJson), HttpStatus.OK); + } + @PostMapping("/queryRegionDropdown") @Log("查询区域下拉框") @SaIgnore diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaPublicInterfaceService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaPublicInterfaceService.java index 9f4fdf9..e100978 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaPublicInterfaceService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaPublicInterfaceService.java @@ -15,20 +15,32 @@ public interface PdaPublicInterfaceService { /** * 查询物料信息 + * * @param whereJson { * class_code: 物料分类编码 * material_code: 物料编码 - * } + * } * @return PdaResponse */ PdaResponse queryMaterInfo(JSONObject whereJson); /** * 查询区域下拉框 + * * @param whereJson { * region_code： 区域编码 - * } + * } * @return PdaResponse */ PdaResponse queryRegionDropdown(JSONObject whereJson); + + /** + * 查询供应商 + * + * @param whereJson { + * supp_code： 供应商编码、名称 + * } + * @return PdaResponse + */ + PdaResponse querySupp(JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index ab3da09..d107736 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -37,6 +37,7 @@ import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; import org.nl.wms.warehouse_management.service.VehicleInService; import org.nl.wms.warehouse_management.service.VehicleOutService; import org.nl.wms.warehouse_management.service.dao.GroupPlate; +import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.stereotype.Service; @@ -76,6 +77,8 @@ public class PdaCommonServiceImpl implements PdaCommonService { @Resource private IMdPbGroupplateService groupplateService; @Resource + private MdPbGroupplateMapper mdPbGroupplateMapper; + @Resource private IMdPbStoragevehicleinfoService storagevehicleinfoService; @Resource private IMdPdGroupbucketService groupbucketService; @@ -168,22 +171,25 @@ public class PdaCommonServiceImpl implements PdaCommonService { if (ObjectUtil.isEmpty(bagNo)) { throw new BadRequestException("袋号不能为空!"); } - List groupPlates = groupplateService.getByBagNo(bagNo, "0"); - if (groupPlates.size() != 1) { - throw new BadRequestException(groupPlates.size() == 0 ? "组袋记录不存在，请先组袋!" : "组袋记录信息有误，请查询并清理后重试！"); + List bagAssembly = mdPbGroupplateMapper.getBagAssembly(param); + if (bagAssembly.size() != 1) { + throw new BadRequestException(bagAssembly.size() == 0 ? "组袋记录不存在，请先组袋!" : "组袋记录信息有误，请查询并清理后重试！"); } - return PdaResponse.requestParamOk(groupPlates.get(0)); + return PdaResponse.requestParamOk(bagAssembly.get(0)); } @Override public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) { - storagevehicleinfoService.getByCode(param.getVehicle_code()); - List groupPlates = param.getGroup_plates(); - for (GroupPlate groupPlate : groupPlates) { - groupPlate.setVehicle_code(param.getVehicle_code()); - groupPlate.setStatus("1"); - } - groupplateService.updateBatchById(groupPlates); + // 判断此载具状态 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("vehicle_code", param.getVehicle_code()); + groupplateService.checkVehicle(jsonObject); + + // 调用PC组盘功能 + GroupPlate groupPlate = new GroupPlate(); + groupPlate.setVehicle_code(param.getVehicle_code()); + groupPlate.setTableData(param.getGroup_plates()); + groupplateService.create(groupPlate); return PdaResponse.requestOk("组盘成功!"); } @@ -202,6 +208,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { } MdPdGroupbucket groupbucket = new MdPdGroupbucket(); BeanUtil.copyProperties(param, groupbucket); + groupbucket.setId(IdUtil.getStringId()); groupbucket.setCreate_id(SecurityUtils.getCurrentUserId()); groupbucket.setCreate_name(SecurityUtils.getCurrentNickName()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java index 59557d4..828f885 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java @@ -2,12 +2,16 @@ package org.nl.wms.pda.general_management.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper; import org.nl.wms.pda.general_management.service.PdaPublicInterfaceService; import org.nl.wms.pda.util.PdaResponse; import org.nl.wms.sch_manage.service.ISchBaseRegionService; import org.nl.wms.sch_manage.service.dao.SchBaseRegion; +import org.nl.wms.warehouse_management.enums.IOSConstant; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -37,6 +41,12 @@ public class PdaUpdatePointServiceImpl implements PdaPublicInterfaceService { @Resource private ISchBaseRegionService iSchBaseRegionService; + /** + * 供应商服务类 + */ + @Resource + private IMdCsSupplierbaseService iMdCsSupplierbaseService; + @Override public PdaResponse queryMaterInfo(JSONObject whereJson) { return PdaResponse.requestParamOk(mdMeMaterialbaseMapper.queryPdaMaterInfo(whereJson)); @@ -58,4 +68,18 @@ public class PdaUpdatePointServiceImpl implements PdaPublicInterfaceService { }); return PdaResponse.requestParamOk(collect); } + + @Override + public PdaResponse querySupp(JSONObject whereJson) { + String supp_code = whereJson.getString("supp_code"); + LambdaQueryWrapper lambda = new QueryWrapper().lambda(); + lambda.eq(MdCsSupplierbase::getIs_used, IOSConstant.ONE); + lambda.eq(MdCsSupplierbase::getIs_delete, IOSConstant.ZERO); + if (ObjectUtil.isNotEmpty(supp_code)) { + lambda.like(MdCsSupplierbase::getSupp_code, supp_code) + .or() + .like(MdCsSupplierbase::getSupp_name, supp_code); + } + return PdaResponse.requestParamOk(iMdCsSupplierbaseService.list(lambda)); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java index 9c543c4..6694372 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java @@ -60,7 +60,7 @@ public interface IMdPbGroupplateService extends IService { * 校验载具 * * @param whereJson { - * storagevehicle_code + * vehicle_code * } */ List checkVehicle(JSONObject whereJson); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java index 8202ca7..348eeab 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.java @@ -72,4 +72,14 @@ public interface MdPbGroupplateMapper extends BaseMapper { List getStockGroupInfo(JSONObject param); JSONArray getDtLMaterialInfo(String vehicleCode, String materialId, String pcsn); + + /** + * 手持 + * 组盘 - 获取袋信息 + * @param whereJson { + * bag_no： 袋码 + * } + * @return List + */ + List getBagAssembly(@Param("param") JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index bfef775..5220a66 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -219,4 +219,23 @@ WHERE g.vehicle_code = #{vehicleCode} AND g.material_id = #{materialId} AND g.pcsn = #{pcsn} AND `status` = '2' +