diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java new file mode 100644 index 0000000..651d213 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java @@ -0,0 +1,64 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; +import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Set; + + +/** + *

+ * 组桶记录 控制层 + *

+ * + * @author Liuxy + * @since 2026-01-13 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/bucked") +@Slf4j +public class BuckController { + + @Resource + private IMdPdGroupbucketService iMdPdGroupbucketService; + + @GetMapping + @Log("分页查询") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPdGroupbucketService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增组盘记录") + public ResponseEntity create(@Validated @RequestBody MdPdGroupbucket dto) { + iMdPdGroupbucketService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改组盘记录") + public ResponseEntity update(@Validated @RequestBody MdPdGroupbucket dto) { + iMdPdGroupbucketService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除组盘") + public ResponseEntity delete(@RequestBody Set ids) { + iMdPdGroupbucketService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java index 4a3e1ed..7476788 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java @@ -93,4 +93,10 @@ public class GroupController { public ResponseEntity queryMaterList() { return new ResponseEntity<>(iMdPbGroupplateService.queryMaterList(), HttpStatus.OK); } + + @PostMapping("/queryRecordNo") + @Log("查询系统参数：证书编号") + public ResponseEntity queryRecordNo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(iMdPbGroupplateService.queryRecordNo(whereJson), HttpStatus.OK); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java index 8c7e9de..a629c2b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java @@ -1,10 +1,14 @@ package org.nl.wms.basedata_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.basedata_manage.service.dao.MdPdGroupbucket; import java.util.List; +import java.util.Map; +import java.util.Set; /** *

@@ -18,10 +22,41 @@ public interface IMdPdGroupbucketService extends IService { /** * 根据桶号获取信息 + * * @param vehicleCode * @return */ List getBucketInfoByBucket(String vehicleCode); void upDateWeight(String weight, String vehicleCode); + + /** + * 分页查询 + * + * @param whereJson : {查询参数} + * @param page : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery page); + + /** + * 新增组桶记录 + * + * @param dto 组盘记录实体类 + */ + void create(MdPdGroupbucket dto); + + /** + * 修改组桶记录 + * + * @param dto 组盘记录实体类 + */ + void update(MdPdGroupbucket dto); + + /** + * 删除组桶记录 + * + * @param ids 标识集合 + */ + void delete(Set ids); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java index 70d0fa1..920a085 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java @@ -2,9 +2,13 @@ package org.nl.wms.basedata_manage.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; import java.util.List; +import java.util.Map; /** *

@@ -19,4 +23,13 @@ public interface MdPdGroupbucketMapper extends BaseMapper { List getBucketInfoByBucket(String vehicleCode); void upDateWeight(String weight, String vehicleCode); + + /** + * 分页查询 + * + * @param page 分页条件 + * @param whereJson 查询条件 + * @return IPage + */ + IPage queryAllByPage(Page page, @Param("param") Map whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml index 3ba1d9e..d7bfb52 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml @@ -22,4 +22,35 @@ WHERE g.bucket_code = #{vehicleCode} + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java index 621292f..70528cc 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java @@ -1,13 +1,26 @@ package org.nl.wms.basedata_manage.service.impl; +import cn.hutool.core.date.DateUtil; 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.common.utils.CodeUtil; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService; import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; +import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; import org.nl.wms.basedata_manage.service.dao.mapper.MdPdGroupbucketMapper; +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; /** *

@@ -20,6 +33,12 @@ import java.util.List; @Service public class MdPdGroupbucketServiceImpl extends ServiceImpl implements IMdPdGroupbucketService { + /** + * 计量单位服务 + */ + @Autowired + private IMdPbMeasureunitService iMdPbMeasureunitService; + @Override public List getBucketInfoByBucket(String vehicleCode) { return this.baseMapper.getBucketInfoByBucket(vehicleCode); @@ -29,4 +48,36 @@ public class MdPdGroupbucketServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { + return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), + whereJson); + } + + @Override + @Transactional + public void create(MdPdGroupbucket dto) { + dto.setBucket_code(CodeUtil.getNewCode("BUCKED_CODE")); + dto.setId(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode("KG"); + dto.setQty_unit_id(unitDao.getMeasure_unit_id()); + dto.setQty_unit_name(unitDao.getUnit_name()); + this.save(dto); + } + + @Override + @Transactional + public void update(MdPdGroupbucket dto) { + this.updateById(dto); + } + + @Override + @Transactional + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java index 3cfed4f..4ccafd9 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaCommonController.java @@ -62,6 +62,18 @@ public class PdaCommonController { public ResponseEntity callStackPlates(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaCommonService.callStackPlates(whereJson), HttpStatus.OK); } + @PostMapping("/queryRecordNo") + @Log("物料组袋-查询证书编号") + @SaIgnore + public ResponseEntity queryRecordNo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaCommonService.queryRecordNo(whereJson), HttpStatus.OK); + } + @PostMapping("/byBagCodeInfo") + @Log("物料组袋-获取袋号") + @SaIgnore + public ResponseEntity byBagCodeInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaCommonService.byBagCodeInfo(whereJson), HttpStatus.OK); + } @PostMapping("/confirmBagAssembly") @Log("物料组袋-确认组袋") @SaIgnore @@ -80,6 +92,12 @@ public class PdaCommonController { public ResponseEntity confirmPalletAssembly(@RequestBody @Valid AssemblyPalletParam param) { return new ResponseEntity<>(pdaCommonService.confirmPalletAssembly(param), HttpStatus.OK); } + @PostMapping("/byBuckCode") + @Log("物料组桶-获取桶号") + @SaIgnore + public ResponseEntity byBuckCode(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaCommonService.byBuckCode(whereJson), HttpStatus.OK); + } @PostMapping("/confirmBucketAssembly") @Log("物料组桶-组桶") @SaIgnore diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java index 507fd50..5af8886 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java @@ -60,4 +60,11 @@ public class PdaPointAndPointController { return new ResponseEntity<>(pdaPointAndPointBoxService.clearMaterial(whereJson), HttpStatus.OK); } + @PostMapping("/clearVehicle") + @Log("点位更新 - 清载具") + @SaIgnore + public ResponseEntity clearVehicle(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaPointAndPointBoxService.clearVehicle(whereJson), HttpStatus.OK); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java index 996acb1..f6b0fe0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaCommonService.java @@ -60,4 +60,31 @@ public interface PdaCommonService { * @return PdaResponse */ PdaResponse callStackPlates(JSONObject whereJson); + + /** + * 物料组袋-查询证书编号 + * @param whereJson { + * + * } + * @return PdaResponse + */ + PdaResponse queryRecordNo(JSONObject whereJson); + + /** + * 物料组袋-获取袋号 + * @param whereJson { + * material_id: 物料标识 + * } + * @return PdaResponse + */ + PdaResponse byBagCodeInfo(JSONObject whereJson); + + /** + * 物料组桶-获取桶号 + * @param whereJson { + * bag_code: 袋码 + * } + * @return PdaResponse + */ + PdaResponse byBuckCode(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 dd34c7f..74b87d1 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 @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.system.service.dict.ISysDictService; @@ -158,7 +159,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { .eq(GroupPlate::getBag_code, param.getBagNo()) .le(GroupPlate::getStatus, "2")); if (list.size() > 0) { - throw new BadRequestException("吨袋[" + param.getBagNo() + "]已经组袋过，请检查！"); + throw new BadRequestException("袋[" + param.getBagNo() + "]已经组袋过，请检查！"); } GroupPlate groupPlate = AssemblyBagParam.buildGroupObj(param); groupplateService.save(groupPlate); @@ -275,4 +276,28 @@ public class PdaCommonServiceImpl implements PdaCommonService { empStackPlatesTask.create(jsonTask); return PdaResponse.requestOk(); } + + @Override + public PdaResponse queryRecordNo(JSONObject whereJson) { + return PdaResponse.requestParamOk(groupplateService.queryRecordNo(null)); + } + + @Override + public PdaResponse byBagCodeInfo(JSONObject whereJson) { + if (ObjectUtil.isEmpty(whereJson.getString("material_id"))) { + throw new BadRequestException("物料标识不能为空!"); + } + String bag_code = groupplateService.createBagCode(whereJson.getString("material_id")); + JSONObject result = new JSONObject(); + result.put("bag_code", bag_code); + return PdaResponse.requestParamOk(result); + } + + @Override + public PdaResponse byBuckCode(JSONObject whereJson) { + String bucket_code = CodeUtil.getNewCode("BUCKED_CODE"); + JSONObject result = new JSONObject(); + result.put("bucket_code", bucket_code); + return PdaResponse.requestParamOk(result); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaTaskServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaTaskServiceImpl.java index c66db75..546a74a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaTaskServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaTaskServiceImpl.java @@ -45,8 +45,9 @@ public class PdaTaskServiceImpl implements PdaTaskService { @Override public PdaResponse againSendTask(JSONObject whereJson) { + JSONObject obj = whereJson.getJSONObject("obj"); // 查询任务 - SchBaseTask taskDao = schBaseTaskMapper.selectById(whereJson.getString("task_id")); + SchBaseTask taskDao = schBaseTaskMapper.selectById(obj.getString("task_id")); // 下发 AbstractTask task = taskFactory.getTask(taskDao.getConfig_code()); task.sendTaskOne(taskDao.getTask_id()); @@ -56,8 +57,9 @@ public class PdaTaskServiceImpl implements PdaTaskService { @Override public PdaResponse forceConfirmTask(JSONObject whereJson) { + JSONObject obj = whereJson.getJSONObject("obj"); // 查询任务 - SchBaseTask taskDao = schBaseTaskMapper.selectById(whereJson.getString("task_id")); + SchBaseTask taskDao = schBaseTaskMapper.selectById(obj.getString("task_id")); // 完成 AbstractTask task = taskFactory.getTask(taskDao.getConfig_code()); task.forceFinish(taskDao.getTask_code()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java index 2fff68a..dffa363 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java @@ -82,4 +82,29 @@ public class IOSConstant { */ public final static String UPDATE_IVT_TYPE_SUB_CANUSE_IVT = "6"; + /** + * 分类编码：原料 + */ + public final static String YL001 = "YL001"; + + /** + * 分类编码：辅料 + */ + public final static String FL001 = "FL001"; + + /** + * 分类编码：粉碎料 + */ + public final static String FS001 = "FS001"; + + /** + * 分类编码：批料 + */ + public final static String PL001 = "PL001"; + + /** + * 分类编码：内包材 + */ + public final static String NBC001 = "NBC001"; + } 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 7102f53..e81d9a0 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 @@ -113,4 +113,20 @@ public interface IMdPbGroupplateService extends IService { * @return List */ List queryMaterList(); + + /** + * 查询系统参数：证书编号 + * @param whereJson { + * + * } + * @return JSONObject + */ + JSONObject queryRecordNo(JSONObject whereJson); + + /** + * 获取袋码 + * @param material_id 物料标识 + * @return String 袋码 + */ + String createBagCode(String material_id); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index 37aa102..18d6981 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -10,16 +10,15 @@ 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.common.exception.BadRequestException; +import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; -import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; -import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; -import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService; -import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; -import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; -import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; -import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; -import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; +import org.nl.system.service.param.dao.Param; +import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata_manage.service.*; +import org.nl.wms.basedata_manage.service.dao.*; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; @@ -70,6 +69,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), @@ -82,8 +87,11 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl tableData = dto.getTableData(); if (ObjectUtil.isEmpty(tableData)) { + // 根据物料类型生成代码 + String bag_code = createBagCode(dto.getMaterial_id()); // 组袋 dto.setGroup_id(IdUtil.getStringId()); + dto.setBag_code(bag_code); // 计量单位默认重量KG MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode("KG"); dto.setQty_unit_id(unitDao.getMeasure_unit_id()); @@ -141,7 +149,7 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl checkVehicle(JSONObject whereJson) { + public List checkVehicle(JSONObject whereJson) { MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("vehicle_code")); if (ObjectUtil.isEmpty(vehicleDao)) { throw new BadRequestException("此载具不存在【" + whereJson.getString("vehicle_code") + "】"); @@ -212,4 +220,47 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl +
+ +
+
+ + + + + + + + + + + + +
+ + + + + 桶标签 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+ + + + + + + + + + + + + + + + + + + +
+
+ + + + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/group.js b/wms/nladmin-ui/src/views/wms/basedata/group/group.js index 9036eaa..91eca41 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/group.js +++ b/wms/nladmin-ui/src/views/wms/basedata/group/group.js @@ -72,4 +72,13 @@ export function queryMaterList(data) { }) } -export default { add, edit, del, queryMater, checkVehicle, querySupp, copySave, printDelete, queryMaterList } +export function queryRecordNo(data) { + return request({ + url: 'api/group/queryRecordNo', + method: 'post', + data + }) +} + +export default { add, edit, del, queryMater, checkVehicle, querySupp, copySave, + printDelete, queryMaterList, queryRecordNo } diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue index eaea32b..f7ab188 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/index.vue @@ -58,7 +58,7 @@ - 物料标签 - + --> -