diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java new file mode 100644 index 0000000..f6a07d5 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java @@ -0,0 +1,78 @@ +package org.nl.wms.pda.general_management.controller; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.pda.general_management.service.PdaGeneralPublicService; +import org.nl.wms.pda.util.PdaResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 平板通用公共接口 控制层 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/pdaGeneralPublic") +@Slf4j +public class PdaGeneralPublicController { + + @Autowired + private PdaGeneralPublicService pdaGeneralPublicService; + + @PostMapping("/queryGroupQuality") + @Log("查询品质类型") + @SaIgnore + public ResponseEntity queryGroupQuality() { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupQuality()), HttpStatus.OK); + } + + @PostMapping("/queryMaterial") + @Log("查询物料") + @SaIgnore + public ResponseEntity queryMaterial(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryMaterial(whereJson)), HttpStatus.OK); + } + + @PostMapping("/querySupp") + @Log("查询供应商") + @SaIgnore + public ResponseEntity querySupp(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.querySupp(whereJson)), HttpStatus.OK); + } + + @PostMapping("/queryBoxType") + @Log("查询料箱类型") + @SaIgnore + public ResponseEntity queryBoxType() { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBoxType()), HttpStatus.OK); + } + + @PostMapping("/queryGroupInfo") + @Log("查询组盘记录") + @SaIgnore + public ResponseEntity queryGroupInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupInfo(whereJson)), HttpStatus.OK); + } + + @PostMapping("/queryBomInfo") + @Log("查询工单信息") + @SaIgnore + public ResponseEntity queryBomInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBomInfo(whereJson)), HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java new file mode 100644 index 0000000..9d777fe --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaInGroupBoxController.java @@ -0,0 +1,49 @@ +package org.nl.wms.pda.general_management.controller; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.pda.general_management.service.PdaInGroupBoxService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 入库组箱 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/pdaInGroupBox") +@Slf4j +public class PdaInGroupBoxController { + + @Autowired + private PdaInGroupBoxService pdaInGroupBoxService; + + @PostMapping("/confirmBox") + @Log("确认组箱") + @SaIgnore + public ResponseEntity confirmBox(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaInGroupBoxService.confirmBox(whereJson), HttpStatus.OK); + } + + @PostMapping("/deliveryBox") + @Log("配送组箱") + @SaIgnore + public ResponseEntity deliveryBox(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaInGroupBoxService.deliveryBox(whereJson), HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaGeneralPublicService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaGeneralPublicService.java new file mode 100644 index 0000000..5d32749 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaGeneralPublicService.java @@ -0,0 +1,69 @@ +package org.nl.wms.pda.general_management.service; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.pda.util.PdaResponse; + +/** + *

+ * 平板通用公共接口 服务类 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +public interface PdaGeneralPublicService { + + /** + * 查询品质类型 + * + * @return PdaResponse + */ + PdaResponse queryGroupQuality(); + + /** + * 查询物料信息 + * + * @param whereJson { + * material_code : 物料编码/名称 + * } + * @return PdaResponse + */ + PdaResponse queryMaterial(JSONObject whereJson); + + /** + * 查询组盘供应商 + * + * @param whereJson { + * supp_code : 供应商编码/名称 + * } + * @return PdaResponse + */ + PdaResponse querySupp(JSONObject whereJson); + + /** + * 查询料箱类型 + * + * @return PdaResponse + */ + PdaResponse queryBoxType(); + + /** + * 查询组盘记录 + * + * @param whereJson { + * storagevehicle_code: 载具编码 + * } + * @return PdaResponse + */ + PdaResponse queryGroupInfo(JSONObject whereJson); + + /** + * 查询工单信息 + * @param whereJson { + * start_time: 日期 + * search: 工单编码/机台编码 + * } + * @return PdaResponse + */ + PdaResponse queryBomInfo(JSONObject whereJson); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java new file mode 100644 index 0000000..0914df4 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/PdaInGroupBoxService.java @@ -0,0 +1,50 @@ +package org.nl.wms.pda.general_management.service; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.pda.util.PdaResponse; + +/** + *

+ * 平板入库组箱 服务类 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +public interface PdaInGroupBoxService { + + /** + * 确认组箱 + * + * @param whereJson { + * storagevehicle_code: 载具编码 + * material_id: 物料ID + * material_code: 物料编码 + * material_name: 物料名称 + * supp_code: 供应商编码 + * supp_name: 供应商名称 + * pcsn: 批号 + * produce_time: 生产日期 + * qty: 重量 + * quality_type: 品质类型 + * bake_num: 烘干次数 + * box_type: 料箱类型 + * } + * @return PdaResponse + */ + PdaResponse confirmBox(JSONObject whereJson); + + /** + * 配送组箱 + * @param whereJson { + * device_code: 机台编码 + * bom_id: 工单标识 + * bom_code: 工单编码 + * material_info: 物料标签信息 -- 可以为空 + * qty: 重量 -- 可以为空 + * rows [] -- 列表明细 + * } + * @return PdaResponse + */ + PdaResponse deliveryBox(JSONObject whereJson); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaGeneralPublicServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaGeneralPublicServiceImpl.java new file mode 100644 index 0000000..3b98b5f --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaGeneralPublicServiceImpl.java @@ -0,0 +1,108 @@ +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.IMdMeMaterialbaseService; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; +import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; +import org.nl.wms.pda.general_management.service.PdaGeneralPublicService; +import org.nl.wms.pda.util.PDAEnum; +import org.nl.wms.pda.util.PdaResponse; +import org.nl.wms.pdm_manage.service.dao.mapper.PdmBomCallMaterialMapper; +import org.nl.wms.warehouse_management.enums.IOSConstant; +import org.nl.wms.warehouse_management.service.dao.mapper.MdPbGroupplateMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 平板通用公共接口 实现类 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +@Service +public class PdaGeneralPublicServiceImpl implements PdaGeneralPublicService { + + /** + * 物料服务 + */ + @Autowired + private IMdMeMaterialbaseService iMdMeMaterialbaseService; + + /** + * 供应商服务 + */ + @Autowired + private IMdCsSupplierbaseService iMdCsSupplierbaseService; + + /** + * 组盘mapper服务 + */ + @Autowired + private MdPbGroupplateMapper mdPbGroupplateMapper; + + /** + * 工单mapper + */ + @Autowired + private PdmBomCallMaterialMapper pdmBomCallMaterialMapper; + + @Override + public PdaResponse queryGroupQuality() { + return PdaResponse.requestParamOk(PDAEnum.QUALITY_TYPE.getDict()); + } + + @Override + public PdaResponse queryMaterial(JSONObject whereJson) { + String material_code = whereJson.getString("material_code"); + + LambdaQueryWrapper qw = new QueryWrapper().lambda(); + qw.eq(MdMeMaterialbase::getIs_delete, IOSConstant.ZERO); + qw.eq(MdMeMaterialbase::getIs_used, IOSConstant.ONE); + if (ObjectUtil.isNotEmpty(material_code)) { + qw.like(MdMeMaterialbase::getMaterial_code, material_code) + .or(row -> row.like(MdMeMaterialbase::getMaterial_name, material_code)); + } + + List materialList = iMdMeMaterialbaseService.list(qw); + return PdaResponse.requestParamOk(materialList); + } + + @Override + public PdaResponse querySupp(JSONObject whereJson) { + String supp_code = whereJson.getString("supp_code"); + + LambdaQueryWrapper wq = new QueryWrapper().lambda(); + wq.eq(MdCsSupplierbase::getIs_delete, IOSConstant.ZERO); + wq.eq(MdCsSupplierbase::getIs_used, IOSConstant.ONE); + if (ObjectUtil.isNotEmpty(supp_code)) { + wq.like(MdCsSupplierbase::getSupp_code, supp_code) + .or(row -> row.like(MdCsSupplierbase::getSupp_name, supp_code)); + } + + List suppList = iMdCsSupplierbaseService.list(wq); + return PdaResponse.requestParamOk(suppList); + } + + @Override + public PdaResponse queryBoxType() { + return PdaResponse.requestParamOk(PDAEnum.BOX_TYPE.getDict()); + } + + @Override + public PdaResponse queryGroupInfo(JSONObject whereJson) { + return PdaResponse.requestParamOk(mdPbGroupplateMapper.pdaQueryGeneralGroupInfo(whereJson)); + } + + @Override + public PdaResponse queryBomInfo(JSONObject whereJson) { + return PdaResponse.requestParamOk(pdmBomCallMaterialMapper.queryBomInfo(whereJson)); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java new file mode 100644 index 0000000..ab5992a --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaInGroupBoxServiceImpl.java @@ -0,0 +1,100 @@ +package org.nl.wms.pda.general_management.service.impl; + +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.exception.BadRequestException; +import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; +import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; +import org.nl.wms.pda.general_management.service.PdaInGroupBoxService; +import org.nl.wms.pda.util.PdaResponse; +import org.nl.wms.pdm_manage.service.IPdmBomCallMaterialService; +import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; +import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; +import org.nl.wms.warehouse_management.service.dao.GroupPlate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + *

+ * 平板入库组箱 实现类 + *

+ * + * @author Liuxy + * @since 2025-09-03 + */ +@Service +public class PdaInGroupBoxServiceImpl implements PdaInGroupBoxService { + + /** + * 组盘服务 + */ + @Autowired + private IMdPbGroupplateService iMdPbGroupplateService; + + /** + * 工单服务 + */ + @Autowired + private IPdmBomCallMaterialService iPdmBomCallMaterialService; + + /** + * 物料服务 + */ + @Autowired + private IMdMeMaterialbaseService iMdMeMaterialbaseService; + + @Override + public PdaResponse confirmBox(JSONObject whereJson) { + GroupPlate groupPlate = JSONObject.parseObject(JSON.toJSONString(whereJson), GroupPlate.class); + iMdPbGroupplateService.create(groupPlate); + return PdaResponse.requestOk(); + } + + @Override + @Transactional + public PdaResponse deliveryBox(JSONObject whereJson) { + // 查询工单 + PdmBomCallMaterial bomDao = iPdmBomCallMaterialService.getById(whereJson.getString("bom_id")); + // 获取当前组盘信息 + JSONObject jsonGroup = whereJson.getJSONArray("rows").toJavaList(JSONObject.class).get(0); + GroupPlate groupDao = iMdPbGroupplateService.getById(jsonGroup.getString("group_id")); + + // 校验当前工单与组盘记录是否相同 + if (!bomDao.getMaterial_id().equals(groupDao.getMaterial_id())) { + throw new BadRequestException("当前组盘物料与工单物料不相同不允许组箱!"); + } + + // 解析二维码信息 + if(ObjectUtil.isNotEmpty(whereJson.getString("material_info"))) { + // 判断数量不能为空 + if (ObjectUtil.isEmpty(whereJson.getString("qty"))) { + throw new BadRequestException("重量不能为空!"); + } + + String[] split = whereJson.getString("material_info").split("##"); + // 物料编码 + String mater_code = split[0]; + // 烘干次数 + String bake_num = split[10]; + // 校验物料 + MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(groupDao.getMaterial_id()); + if (!materDao.getMaterial_code().equals(mater_code)) { + throw new BadRequestException("新增物料与组盘物料不符，不允许组箱!"); + } + // 校验烘干次数 + if (!groupDao.getBake_num().toString().equals(bake_num)) { + throw new BadRequestException("新增物料烘干次数与组盘物料烘干次数不符，不允许组箱!"); + } + // 叠加组盘重量 + groupDao.setQty(NumberUtil.add(groupDao.getQty(),whereJson.getBigDecimal("qty"))); + } + // 绑定工单信息 + groupDao.setBom_id(bomDao.getBom_id()); + iMdPbGroupplateService.updateById(groupDao); + + return PdaResponse.requestOk(); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java index 306a178..6fdb094 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/util/PDAEnum.java @@ -28,6 +28,15 @@ public enum PDAEnum { // 库区编码 SECT_CODE(MapOf.of("合格区", "HG01", "待检区", "DJ01", "不合格区", "BHG01")), + // 组盘品质类型 + QUALITY_TYPE(MapOf.of("待检", "1", "合格", "2", "不合格", "3")), + + // 组盘品质类型 + BOX_TYPE(MapOf.of("小料箱", "1", "大料箱", "2", "焊条筒", "3")), + + // 运送类型 + TASK_TYPE(MapOf.of("小料箱", "1", "大料箱或其他", "2")), + ; private Map code; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java index d41462b..40ee127 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java @@ -61,6 +61,13 @@ public class BomCallMaterialController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/startBom") + @Log("提交叫料单") + public ResponseEntity startBom(@RequestBody PdmBomCallMaterial dao) { + iPdmBomCallMaterialService.startBom(dao); + return new ResponseEntity<>(HttpStatus.CREATED); + } + @PostMapping("/confirm") @Log("强制确认叫料单") public ResponseEntity confirm(@RequestBody PdmBomCallMaterial dao) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java index 6a8de4c..6bf9280 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/enums/BomEnum.java @@ -21,7 +21,7 @@ import java.util.Map; public enum BomEnum { // 叫料单主表状态 - CALL_BOM_STATUS(MapOf.of("生成", "1", "叫料中", "2", "叫料完成", "3" + CALL_BOM_STATUS(MapOf.of("生成", "0", "提交", "1", "叫料中", "2", "叫料完成", "3" , "退料中", "4", "完成", "5" )), diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java index d2e0eac..2f46353 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java @@ -44,26 +44,39 @@ public interface IPdmBomCallMaterialService extends IService /** * 删除叫料单 + * * @param ids id集合 */ void delete(Set ids); /** * 根据工单编码查询 + * * @param bom_code 工单编码 * @return PdmBomCallMaterial 实体类 */ - PdmBomCallMaterial findByCode (String bom_code); + PdmBomCallMaterial findByCode(String bom_code); /** * 更新叫料单状态 + * * @param bom_id 叫料单标识 */ void updateStatus(String bom_id); + /** + * 提交 + * + * @param dao 叫料单实体类 + */ + void startBom(PdmBomCallMaterial dao); + /** * 强制确认叫料单 + * * @param dao 叫料单实体类 */ void confirm(PdmBomCallMaterial dao); + + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java index f69d835..c86d312 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java @@ -44,6 +44,11 @@ public class PdmBomCallMaterial implements Serializable { */ private String device_code; + /** + * 设备名称 + */ + private String device_name; + /** * 叫料重量 */ @@ -89,6 +94,11 @@ public class PdmBomCallMaterial implements Serializable { */ private String create_time; + /** + * 开始时间 + */ + private String start_time; + /** * 结束时间 */ diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java index af1755c..ebf0582 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java @@ -1,5 +1,6 @@ package org.nl.wms.pdm_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; @@ -7,6 +8,7 @@ import org.apache.ibatis.annotations.Param; import org.nl.wms.pdm_manage.service.dao.PdmBomCallMaterial; import org.nl.wms.pdm_manage.service.dto.PdmBomCallMaterialDto; +import java.util.List; import java.util.Map; /** @@ -26,4 +28,14 @@ public interface PdmBomCallMaterialMapper extends BaseMapper * @return IPage */ IPage queryAllByPage(Page page, @Param("param") Map whereJson); + + /** + * 查询工单信息 + * @param whereJson { + * start_time: 日期 + * search: 工单编码/机台编码 + * } + * @return List + */ + List queryBomInfo(@Param("param") JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml index 19a8ec0..143e22b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml @@ -39,4 +39,30 @@ ORDER BY bom.create_time Desc + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java index 8069bdf..d368fca 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java @@ -114,6 +114,14 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl { * @return List */ List pdaQueryGroupInfo(@Param("param") JSONObject whereJson); + + /** + * 手持通用功能公共查询 + * @param whereJson { + * storagevehicle_code: 载具编码 + * } + * @return List + */ + List pdaQueryGeneralGroupInfo(@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 785a439..84e84be 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 @@ -79,4 +79,30 @@ ORDER BY late.create_time Desc + + diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js index 96eb916..a1533af 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js @@ -32,4 +32,12 @@ export function confirm(data) { }) } -export default { add, edit, del, confirm } +export function startBom(data) { + return request({ + url: 'api/bomCallMaterial/startBom', + method: 'post', + data + }) +} + +export default { add, edit, del, confirm, startBom } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue index 126f168..4a72b0d 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue @@ -60,6 +60,17 @@ + + 提交 + + + + + + + @@ -139,12 +156,14 @@ + - + + @@ -188,12 +207,14 @@ const defaultForm = { material_id: null, bom_id: null, device_code: null, + device_name: null, call_qty: null, real_qty: null, bom_status: null, create_id: null, create_name: null, create_time: null, + start_time: null, confirm_time: null } export default { @@ -272,6 +293,17 @@ export default { this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) + }, + startBom() { + const data = this.$refs.table.selection[0] + if (data.bom_status !== '0') { + this.crud.notify('当前状态不为生成不允许提交!！', CRUD.NOTIFICATION_TYPE.INFO) + return + } + crudCallMaterial.startBom(data).then(res => { + this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) } } } diff --git a/wms/nladmin-ui/src/views/wms/sch/pointtopoint/index.vue b/wms/nladmin-ui/src/views/wms/sch/pointtopoint/index.vue index e955c07..9c70138 100644 --- a/wms/nladmin-ui/src/views/wms/sch/pointtopoint/index.vue +++ b/wms/nladmin-ui/src/views/wms/sch/pointtopoint/index.vue @@ -103,13 +103,13 @@ - + - + @@ -117,13 +117,13 @@ - + - +