diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java index 232593c..5b66337 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structattr.java @@ -1,5 +1,7 @@ package org.nl.wms.basedata_manage.service.dao; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -183,11 +185,13 @@ public class Structattr implements Serializable { /** * 存储载具号 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String storagevehicle_code; /** * 存储载具类型 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String storagevehicle_type; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java index dd58e51..1fbdd48 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java @@ -43,8 +43,7 @@ public class BigScreenController { @Log("大屏数据") @SaIgnore public ResponseEntity getData(@RequestBody JSONObject stors) { -// String storStr = stors.getString("stors"); - String storStr = "LT,YL"; + String storStr = stors.getString("stors"); List data = new ArrayList<>(); if (!StringUtils.isEmpty(storStr)){ data = bigScreenService.getData(Arrays.asList(storStr.split(","))); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java index 6579d56..b6292a1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/controller/PdaJBController.java @@ -68,4 +68,40 @@ public class PdaJBController { public ResponseEntity jbReturnMaterial(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaJBService.jbReturnMaterial(whereJson), HttpStatus.OK); } + @PostMapping("/jbGetVehicleCode") + @Log("获取解包点位的托盘编码") + @SaIgnore + public ResponseEntity jbGetVehicleCode(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.jbGetVehicleCode(whereJson), HttpStatus.OK); + } + @PostMapping("/jbGetLtInfo") + @Log("获取料桶组盘信息") + @SaIgnore + public ResponseEntity jbGetLtInfo(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.jbGetLtInfo(whereJson), HttpStatus.OK); + } + @PostMapping("/jbEmptyTakeOut") + @Log("空桶取出") + @SaIgnore + public ResponseEntity jbEmptyTakeOut(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.jbEmptyTakeOut(whereJson), HttpStatus.OK); + } + @PostMapping("/getAllIntoRegionMembers") + @Log("获取所有区域成员") + @SaIgnore + public ResponseEntity getAllIntoRegionMembers(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.getAllIntoRegionMembers(whereJson), HttpStatus.OK); + } + @PostMapping("/intoRegion") + @Log("进入区域") + @SaIgnore + public ResponseEntity intoRegion(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.intoRegion(whereJson), HttpStatus.OK); + } + @PostMapping("/outRegion") + @Log("出去区域") + @SaIgnore + public ResponseEntity outRegion(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(pdaJBService.outRegion(whereJson), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/GroupInfoPdaVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/GroupInfoPdaVo.java new file mode 100644 index 0000000..92bec2a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/GroupInfoPdaVo.java @@ -0,0 +1,23 @@ +package org.nl.wms.pda_manage.sch_manage.service; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Author: lyd + * @Date: 2025/8/1 + */ +@Data +public class GroupInfoPdaVo implements Serializable { + private String storagevehicle_code; + private String pcsn; + private BigDecimal qty; + private String qty_unit_name; + private String supp_name; + private String material_code; + private String material_name; + private String material_spec; + private String material_model; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java index 64b3ab4..7819db0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/PdaJBService.java @@ -36,4 +36,26 @@ public interface PdaJBService { * @return */ PdaResponse jbReturnMaterial(JSONObject param); + + PdaResponse jbGetVehicleCode(JSONObject param); + + PdaResponse jbGetLtInfo(JSONObject param); + + PdaResponse jbEmptyTakeOut(JSONObject param); + + /** + * + * @param whereJson + * @return + */ + PdaResponse getAllIntoRegionMembers(JSONObject whereJson); + + /** + * 进入区域 + * @param param + * @return + */ + PdaResponse intoRegion(JSONObject param); + + PdaResponse outRegion(JSONObject param); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java index 7983a27..5c50d31 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/impl/PdaJBServiceImpl.java @@ -21,16 +21,21 @@ import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.basedata_manage.service.dao.Sectattr; import org.nl.wms.basedata_manage.service.dao.Structattr; +import org.nl.wms.pda_manage.sch_manage.service.GroupInfoPdaVo; import org.nl.wms.pda_manage.sch_manage.service.PdaJBService; import org.nl.wms.pda_manage.sch_manage.service.mapper.PdaJBMapper; import org.nl.wms.pda_manage.util.PdaResponse; import org.nl.wms.pm_manage.service.IPdmBdWorkorderService; import org.nl.wms.pm_manage.service.dao.PdmBdWorkorder; +import org.nl.wms.record_manage.service.IMdPbRegionMemberService; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.util.tasks.jb.JbUpAgvTask; import org.nl.wms.system_manage.service.dict.ISysDictService; import org.nl.wms.system_manage.service.dict.dao.Dict; +import org.nl.wms.system_manage.service.param.ISysParamService; +import org.nl.wms.system_manage.service.param.dao.Param; import org.nl.wms.warehouse_manage.enums.IOSEnum; import org.nl.wms.warehouse_manage.inAndOut.service.IInBillService; import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService; @@ -57,6 +62,8 @@ import java.util.*; @Service @Slf4j public class PdaJBServiceImpl implements PdaJBService { + /** 解包重量误差范围值 */ + public static final String JB_STANDARD_ERROR = "JB_STANDARD_ERROR"; @Autowired private PdaJBMapper pdaJBMapper; @Autowired @@ -89,6 +96,10 @@ public class PdaJBServiceImpl implements PdaJBService { private IInBillService inBillService; @Resource private IMdPbStoragevehicleinfoService storagevehicleinfoService; + @Resource + private ISysParamService sysParamService; + @Resource + private IMdPbRegionMemberService regionMemberService; @Override public PdaResponse getOrderList(JSONObject whereJson) { String flag = whereJson.getString("flag"); @@ -209,10 +220,25 @@ public class PdaJBServiceImpl implements PdaJBService { @Override public PdaResponse getWeight(JSONObject whereJson) { // todo: 调用acs获取 + String currentUserId = SecurityUtils.getCurrentUserId(); + String pointCode = whereJson.getString("point_code"); + String workorder_id = whereJson.getString("workorder_id"); + Param param = sysParamService.findByCode(JB_STANDARD_ERROR); + if (ObjectUtil.isEmpty(param)) { + throw new BadRequestException("请先定义 " + JB_STANDARD_ERROR + " 系统参数!"); + } JSONObject res = new JSONObject(); res.put("weight", "999.99"); - res.put("flag", "2"); - res.put("message", "重量误差过大，请注意！"); + res.put("flag", "1"); + res.put("message", "重量误差范围正常！"); + PdmBdWorkorder workorder = workorderService.getById(workorder_id); + res.put("org_weight", workorder.getPlan_weight()); + res.put("stand_error", param.getValue()); + if (workorder.getPlan_weight().subtract(BigDecimal.valueOf(999.99)) + .abs().compareTo(new BigDecimal(param.getValue().trim())) > 0) { + res.put("flag", "2"); + res.put("message", "重量误差过大，请注意！"); + } return PdaResponse.requestParamOk(res); } @@ -404,6 +430,9 @@ public class PdaJBServiceImpl implements PdaJBService { structattr.setStoragevehicle_code(groupPlate.getStoragevehicle_code()); structattr.setStoragevehicle_type(vehicleInfo.getStoragevehicle_type()); structattr.setOccupancy_state(3); + structattr.setUpdate_id(currentUserId); + structattr.setUpdate_name(nickName); + structattr.setUpdate_time(now); structattrService.updateById(structattr); // 1.4 组盘设置入库 @@ -507,6 +536,117 @@ public class PdaJBServiceImpl implements PdaJBService { return PdaResponse.requestOk(); } + @Override + public PdaResponse jbGetVehicleCode(JSONObject param) { + String pointCode = param.getString("point_code"); + SchBasePoint device = pointService.getById(pointCode); + // 获取对应区域的点位 + SchBasePoint tPPoint = pointService.getOne(new LambdaQueryWrapper() + .eq(SchBasePoint::getRegion_code, device.getRegion_code()) + .eq(SchBasePoint::getParent_point_code, device.getPoint_code()) + .eq(SchBasePoint::getPoint_type, "3")); + SchBasePoint ltPoint = pointService.getOne(new LambdaQueryWrapper() + .eq(SchBasePoint::getRegion_code, device.getRegion_code()) + .eq(SchBasePoint::getParent_point_code, device.getPoint_code()) + .eq(SchBasePoint::getPoint_type, "2")); + JSONObject res = new JSONObject(); + res.put("tp_code", tPPoint.getVehicle_code()); + res.put("lt_code", ltPoint.getVehicle_code()); + return PdaResponse.requestParamOk(res); + } + + @Override + public PdaResponse jbGetLtInfo(JSONObject param) { + String vehicleCode = param.getString("vehicle_code"); + List groups = pdaJBMapper.getGroupInfoByVehicle(vehicleCode, "01"); + if (groups.size() > 1) { + throw new BadRequestException("组盘信息错误!"); + } + return PdaResponse.requestParamOk(groups.size() > 0 ? groups.get(0) : null); + } + + @Override + public PdaResponse jbEmptyTakeOut(JSONObject param) { + String pointCode = param.getString("point_code"); + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + JSONObject res = doCheckStruct(pointCode); + if ("2".equals(res.getString("flag"))) { + throw new BadRequestException(res.getString("message")); + } + Structattr structattr = structattrService.getByCode(pointCode); + if (ObjectUtil.isEmpty(structattr)) { + throw new BadRequestException("仓位：" + pointCode + " 不存在！"); + } + // 1.3 仓位赋值 + structattr.setStoragevehicle_code(null); + structattr.setStoragevehicle_type(null); + structattr.setOccupancy_state(1); + structattr.setUpdate_id(currentUserId); + structattr.setUpdate_name(nickName); + structattr.setUpdate_time(now); + structattrService.updateById(structattr); + return PdaResponse.requestOk(); + } + + @Override + public PdaResponse getAllIntoRegionMembers(JSONObject whereJson) { + String regionCode = whereJson.getString("region_code"); + List list = regionMemberService.list(new LambdaQueryWrapper() + .eq(MdPbRegionMember::getRecord_status, "1") + .eq(MdPbRegionMember::getRegion_code, regionCode)); + return PdaResponse.requestParamOk(list); + } + + @Override + public PdaResponse intoRegion(JSONObject param) { + String regionCode = param.getString("region_code"); + String nickname = param.getString("nickname"); + MdPbRegionMember pbRegionMember = regionMemberService.getOne(new LambdaQueryWrapper() + .eq(MdPbRegionMember::getRegion_code, regionCode) + .eq(MdPbRegionMember::getInto_member, nickname) + .eq(MdPbRegionMember::getRecord_status, "1"), false); + if (ObjectUtil.isNotEmpty(pbRegionMember)) { + throw new BadRequestException("您已经记录进入该区域，请勿多次进入!"); + } + MdPbRegionMember regionMember = new MdPbRegionMember(); + regionMember.setRecord_id(IdUtil.getStringId()); + regionMember.setInto_member(nickname); + regionMember.setIn_time(DateUtil.now()); + regionMember.setRecord_status("1"); + regionMember.setRegion_code(regionCode); + regionMemberService.save(regionMember); + return PdaResponse.requestOk(); + } + + @Override + public PdaResponse outRegion(JSONObject param) { + // region_code、nickname、rows + String regionCode = param.getString("region_code"); + String nickname = param.getString("nickname"); + JSONArray rows = param.getJSONArray("rows"); + List memberRecords; + if (rows.size() > 0) { + memberRecords = rows.toJavaList(MdPbRegionMember.class); + } else { + // 更新自身 + memberRecords = regionMemberService.list(new LambdaQueryWrapper() + .eq(MdPbRegionMember::getRecord_status, "1") + .eq(MdPbRegionMember::getInto_member, nickname) + .eq(MdPbRegionMember::getRegion_code, regionCode)); + } + memberRecords.forEach(m -> { + m.setOut_time(DateUtil.now()); + m.setOperate_name(nickname); + m.setRecord_status("2"); + }); + if (memberRecords.size() > 0) { + regionMemberService.updateBatchById(memberRecords); + } + return PdaResponse.requestOk(); + } + private Map buildTaskData(String pointCode, String workorderId, String invId) { Map jsonMst = new HashMap<>(); // ru库点 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java index 4fbe62e..a939a58 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.java @@ -1,6 +1,7 @@ package org.nl.wms.pda_manage.sch_manage.service.mapper; import org.nl.wms.basedata_manage.service.dao.Structattr; +import org.nl.wms.pda_manage.sch_manage.service.GroupInfoPdaVo; import org.nl.wms.pm_manage.service.dao.PdmBdWorkorder; import org.nl.wms.sch_manage.service.dao.SchBasePoint; @@ -28,4 +29,12 @@ public interface PdaJBMapper { * @return */ List getCanUseCFGJ(PdmBdWorkorder workorder, String pointStatus); + + /** + * 获取组盘信息 + * @param vehicleCode 托盘 + * @param groupStatus 状态 + * @return + */ + List getGroupInfoByVehicle(String vehicleCode, String groupStatus); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml index 837454f..3296279 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/sch_manage/service/mapper/PdaJBMapper.xml @@ -37,4 +37,21 @@ OR t.point_code4 = p.point_code )) + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java index 4eb7871..c92f9e5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/util/PdaResponse.java @@ -17,6 +17,7 @@ import org.nl.common.base.TableDataInfo; @Data @Builder public class PdaResponse { + private String code; /** * 信息 @@ -34,6 +35,7 @@ public class PdaResponse { */ public static PdaResponse requestOk() { return PdaResponse.builder() + .code("200") .message("操作成功!") .build(); } @@ -44,6 +46,7 @@ public class PdaResponse { */ public static PdaResponse requestParamOk(T data) { return PdaResponse.builder() + .code("200") .message("操作成功!") .data(data) .build(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/controller/MdPbRegionMemberController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/controller/MdPbRegionMemberController.java new file mode 100644 index 0000000..6a7eefb --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/controller/MdPbRegionMemberController.java @@ -0,0 +1,59 @@ +package org.nl.wms.record_manage.controller; + +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.record_manage.service.IMdPbRegionMemberService; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; +/** +* @author liyd +* @date 2025-08-01 +**/ +@Slf4j +@RestController +@RequestMapping("/api/mdPbRegionMember") +public class MdPbRegionMemberController { + + @Autowired + private IMdPbRegionMemberService mdPbRegionMemberService; + + @GetMapping + @Log("查询管控区域记录") + //@SaCheckPermission("mdPbRegionMember:list") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(mdPbRegionMemberService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增管控区域记录") + //@SaCheckPermission("mdPbRegionMember:add") + public ResponseEntity create(@Validated @RequestBody MdPbRegionMember entity){ + mdPbRegionMemberService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改管控区域记录") + //@SaCheckPermission("mdPbRegionMember:edit") + public ResponseEntity update(@Validated @RequestBody MdPbRegionMember entity){ + mdPbRegionMemberService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除管控区域记录") + //@SaCheckPermission("mdPbRegionMember:del") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + mdPbRegionMemberService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/IMdPbRegionMemberService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/IMdPbRegionMemberService.java new file mode 100644 index 0000000..6c7be7f --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/IMdPbRegionMemberService.java @@ -0,0 +1,43 @@ +package org.nl.wms.record_manage.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author liyd +* @date 2025-08-01 +**/ +public interface IMdPbRegionMemberService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(MdPbRegionMember entity); + + /** + * 编辑 + * @param entity / + */ + void update(MdPbRegionMember entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/MdPbRegionMember.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/MdPbRegionMember.java new file mode 100644 index 0000000..2596417 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/MdPbRegionMember.java @@ -0,0 +1,46 @@ +package org.nl.wms.record_manage.service.dao; + + import com.baomidou.mybatisplus.annotation.IdType; + import com.baomidou.mybatisplus.annotation.TableId; + import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author liyd +* @date 2025-08-01 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_region_member") +public class MdPbRegionMember implements Serializable { + +private static final long serialVersionUID = 1L; + + @TableId(value = "record_id", type = IdType.NONE) + /** 记录id */ + private String record_id; + + /** 进入成员 */ + private String into_member; + + /** 进入时间 */ + private String in_time; + + /** 状态：1进去，2出去 */ + private String record_status; + + /** 出去时间 */ + private String out_time; + + /** 管控区域 */ + private String region_code; + + /** 操作人员 */ + private String operate_name; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.java new file mode 100644 index 0000000..e4766f7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.record_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; + +/** +* @author liyd +* @date 2025-08-01 +**/ +public interface MdPbRegionMemberMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.xml new file mode 100644 index 0000000..483a65b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dao/mapper/MdPbRegionMemberMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberDto.java new file mode 100644 index 0000000..56565cb --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberDto.java @@ -0,0 +1,36 @@ +package org.nl.wms.record_manage.service.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author liyd +* @date 2025-08-01 +**/ +@Data +public class MdPbRegionMemberDto implements Serializable { + + /** 记录id */ + private String record_id; + + /** 进入成员 */ + private String member; + + /** 进入时间 */ + private String in_time; + + /** 状态：1进去，2出去 */ + private String record_status; + + /** 出去时间 */ + private String out_time; + + /** 管控区域 */ + private String region_code; + + /** 操作人员 */ + private String operate_name; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberQuery.java new file mode 100644 index 0000000..857f8bd --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/dto/MdPbRegionMemberQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.record_manage.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; + +/** +* @author liyd +* @date 2025-08-01 +**/ +public class MdPbRegionMemberQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/impl/MdPbRegionMemberServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/impl/MdPbRegionMemberServiceImpl.java new file mode 100644 index 0000000..36926da --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/record_manage/service/impl/MdPbRegionMemberServiceImpl.java @@ -0,0 +1,63 @@ +package org.nl.wms.record_manage.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.config.language.LangProcess; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.record_manage.service.IMdPbRegionMemberService; +import org.nl.wms.record_manage.service.dao.mapper.MdPbRegionMemberMapper; +import org.nl.wms.record_manage.service.dao.MdPbRegionMember; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author liyd +* @date 2025-08-01 +**/ +@Slf4j +@Service +public class MdPbRegionMemberServiceImpl extends ServiceImpl implements IMdPbRegionMemberService { + + @Autowired + private MdPbRegionMemberMapper mdPbRegionMemberMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + mdPbRegionMemberMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(MdPbRegionMember entity) { + entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + mdPbRegionMemberMapper.insert(entity); + } + + @Override + public void update(MdPbRegionMember entity) { + MdPbRegionMember dto = mdPbRegionMemberMapper.selectById(entity.getRecord_id()); + if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); + mdPbRegionMemberMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + mdPbRegionMemberMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java index 2c28b43..4d1acde 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/InBillServiceImpl.java @@ -676,6 +676,7 @@ public class InBillServiceImpl extends ServiceImpl i SchBasePoint parentPoint = pointService.getById(rkPoint.getParent_point_code()); // 2、创建任务（4条任务、优先级需要获取所有的任务中的最小值并且-1，默认8） // 获取工单对应的区域的出入点 + // todo: 不对 SchBasePoint intoPoint = pointService.getNotTaskByRegionAndType(parentPoint.getRegion_code(), "2"); SchBasePoint emptyPoint = pointService.getNotTaskByRegionAndType(parentPoint.getRegion_code(), "5"); SchBasePoint fullPoint = pointService.getNotTaskByRegionAndType(parentPoint.getRegion_code(), "6"); diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index bd9e0ae..b708b69 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -92,6 +92,7 @@ + diff --git a/lms/nladmin-ui/src/views/system/menu/locale/en.js b/lms/nladmin-ui/src/views/system/menu/locale/en.js index 7100542..ec5a3ba 100644 --- a/lms/nladmin-ui/src/views/system/menu/locale/en.js +++ b/lms/nladmin-ui/src/views/system/menu/locale/en.js @@ -44,6 +44,7 @@ export default { }, 'msg': { 'delete_msg': 'Are you sure to delete it? If there are subordinate nodes, they will be deleted together. This operation cannot be undone!' - } + }, + 'SystemParam': 'sys parameter' } } diff --git a/lms/nladmin-ui/src/views/system/menu/locale/in.js b/lms/nladmin-ui/src/views/system/menu/locale/in.js index 7fbe7a3..661e0e6 100644 --- a/lms/nladmin-ui/src/views/system/menu/locale/in.js +++ b/lms/nladmin-ui/src/views/system/menu/locale/in.js @@ -44,6 +44,7 @@ export default { }, 'msg': { 'delete_msg': 'Apakah Anda yakin untuk menghapusnya? Jika ada nod subordinat, mereka akan dihapus bersama. Operasi ini tidak dapat dibatalkan!' - } + }, + 'SystemParam': 'parameter sistem' } } diff --git a/lms/nladmin-ui/src/views/system/menu/locale/zh.js b/lms/nladmin-ui/src/views/system/menu/locale/zh.js index d930887..2c17a16 100644 --- a/lms/nladmin-ui/src/views/system/menu/locale/zh.js +++ b/lms/nladmin-ui/src/views/system/menu/locale/zh.js @@ -44,6 +44,7 @@ export default { }, 'msg': { 'delete_msg': '确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！' - } + }, + 'SystemParam': '系统参数' } } diff --git a/lms/nladmin-ui/src/views/system/param/index.vue b/lms/nladmin-ui/src/views/system/param/index.vue index b9a234b..89d577e 100644 --- a/lms/nladmin-ui/src/views/system/param/index.vue +++ b/lms/nladmin-ui/src/views/system/param/index.vue @@ -19,6 +19,15 @@ + + + + + + + + + @@ -73,6 +82,9 @@ const defaultForm = { id: null, code: null, name: null, + zh_name: null, + en_name: null, + in_name: null, value: null, remark: null, is_active: true diff --git a/lms/nladmin-ui/src/views/system/param/locale/en.js b/lms/nladmin-ui/src/views/system/param/locale/en.js index 7255108..79710ae 100644 --- a/lms/nladmin-ui/src/views/system/param/locale/en.js +++ b/lms/nladmin-ui/src/views/system/param/locale/en.js @@ -2,7 +2,10 @@ export default { 'SysParam': { 'table': { 'code': 'code', - 'name': 'name', + 'name': 'default name', + 'zh_name': 'chinese name', + 'en_name': 'english name', + 'in_name': 'indonesian name', 'values': 'value', 'description': 'remark' }, diff --git a/lms/nladmin-ui/src/views/system/param/locale/in.js b/lms/nladmin-ui/src/views/system/param/locale/in.js index 29b2312..2d30aa0 100644 --- a/lms/nladmin-ui/src/views/system/param/locale/in.js +++ b/lms/nladmin-ui/src/views/system/param/locale/in.js @@ -2,7 +2,10 @@ export default { 'SysParam': { 'table': { 'code': 'kode', - 'name': 'nama', + 'name': 'nama bawaan', + 'zh_name': 'nama cina', + 'en_name': 'nama Inggris', + 'in_name': 'nama indonesia', 'values': 'nilai', 'description': 'Catatan' }, diff --git a/lms/nladmin-ui/src/views/system/param/locale/zh.js b/lms/nladmin-ui/src/views/system/param/locale/zh.js index 1b045b6..e7b3e01 100644 --- a/lms/nladmin-ui/src/views/system/param/locale/zh.js +++ b/lms/nladmin-ui/src/views/system/param/locale/zh.js @@ -2,7 +2,10 @@ export default { 'SysParam': { 'table': { 'code': '编码', - 'name': '名称', + 'name': '默认名称', + 'zh_name': '中文名称', + 'en_name': '英文名称', + 'in_name': '印尼名称', 'values': '值', 'description': '备注' }, diff --git a/lms/nladmin-ui/src/views/wms/record/index.vue b/lms/nladmin-ui/src/views/wms/record/index.vue new file mode 100644 index 0000000..017df49 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/record/index.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/record/mdPbRegionMember.js b/lms/nladmin-ui/src/views/wms/record/mdPbRegionMember.js new file mode 100644 index 0000000..08be015 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/record/mdPbRegionMember.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/mdPbRegionMember', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/mdPbRegionMember/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/mdPbRegionMember', + method: 'put', + data + }) +} + +export default { add, edit, del }