diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 20e4eb4a..3804c024 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -56,8 +56,8 @@ public enum AcsTaskEnum { ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), - ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("3","诺宝双入-双任务"), - ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("4","诺宝单入-单任务"), + ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), + ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), ACS_TASK_TYPE_NOBLE_POINT_POINT_TASK("5","诺宝点对点任务"), ACS_TASK_TYPE_WEIGHING_TASK_OF_PS20("6","PS20称重任务（刻字-包装）"), ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20("7","PS20不称重任务（刻字-包装）"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java index 0f7a6210..bb3b0157 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java @@ -34,7 +34,7 @@ public class RedissonUtils { if (isLock){ process.process(); } else { - throw new BadRequestException("当前业务 key:"+key+"正在锁定请稍后再试"); + throw new BadRequestException("当前业务 key:"+key+"正在执行请稍后再试"); } }finally { if (isLock){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 66b5d99f..847697f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -120,7 +120,6 @@ public class AcsToWmsController { } - @GetMapping("/taskPublish") @Log("taskPublish") @ApiOperation("taskPublish") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java index 03a9fb03..fa14fc08 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java @@ -163,14 +163,17 @@ public class AgvInstService { //3.agv根据对应载具列表行进扫码匹配：匹配到对应物料则创建点对点任务 public void empMatter(JSONObject task){ //参数 - String startPoint = task.getString("cacheLine"); + String startPoint = task.getString("point_code1"); String cacheVehile = getCacheVehile(startPoint, task.getString("material_id")); if (StringUtils.isBlank(cacheVehile)) { throw new BadRequestException("缓存线："+startPoint+"没有物料"+task.getString("material_id")+"对应可用载具"); } //判断当前物料载具已经任务分配数量：如果>物料已经分配任务。说明满了，不允许再分配 - List allocateTask = taskService.list(new QueryWrapper().eq("point_code1", startPoint).eq("material_id", task.getString("material_id")).lt("task_status", StatusEnum.TASK_FINISH.getCode())); - if (allocateTask.size()>=cacheVehile.split(",").length){ + List allocateTask = taskService.list(new QueryWrapper() + .eq("point_code1", startPoint) + .eq("material_id", task.getString("material_id")) + .in("task_status", "4","5","6")); + if (allocateTask.size()>cacheVehile.split(",").length){ log.error("callMatter 缓存线:{}上含有物料:{}的载具分配完，任务id:{}",startPoint,task.getString("material_id"),allocateTask.stream().map(SchBaseTask::getTask_id).collect(Collectors.joining(","))); throw new BadRequestException(String.format("缓存线%s上含物料%s的载具已分配完",startPoint,task.getString("material_id"))); } @@ -191,7 +194,7 @@ public class AgvInstService { if (StringUtils.isNotEmpty(cacheLine)){ int count = taskService.count(new QueryWrapper().eq("point_code2", cacheLine).lt("task_status", StatusEnum.TASK_FINISH.getCode())); String status = StringUtils.isBlank(materialId) ? StatusEnum.CACHE_VEL_EMT.getCode() : StatusEnum.CACHE_VEL_FULL.getCode(); - List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId)); + List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId, "cacheLine",cacheLine)); if (vehicle.size()>0){ if (vehicle.size()>count){ return vehicle.stream().map(SchCachelineVehicle::getVehicle_code).collect(Collectors.joining(",")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java index 8d394c3a..e73d8b30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java @@ -1,5 +1,6 @@ package org.nl.wms.masterdata_manage.service.vehicle; +import com.alibaba.fastjson.JSONObject; import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import com.baomidou.mybatisplus.extension.service.IService; @@ -24,4 +25,6 @@ public interface IMdPbBucketrecordService extends IService { * @return Object / */ Object queryAll(Map whereJson, PageQuery page); + + void createBucke(MdPbBucketrecord dao); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java index a56b0198..366d7cb6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbBucketrecord.java @@ -1,6 +1,8 @@ package org.nl.wms.masterdata_manage.service.vehicle.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; @@ -28,6 +30,7 @@ public class MdPbBucketrecord implements Serializable { /** * 桶记录标识 */ + @TableId private Long bucket_record_id; /** @@ -43,7 +46,7 @@ public class MdPbBucketrecord implements Serializable { /** * 物料标识 */ - private Long material_id; + private String material_id; /** * 批次 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java index a5b05c90..3cd90ee2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/MdPbStoragevehicleext.java @@ -1,6 +1,8 @@ package org.nl.wms.masterdata_manage.service.vehicle.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; import java.io.Serializable; @@ -27,6 +29,7 @@ public class MdPbStoragevehicleext implements Serializable { /** * 载具扩展标识 */ + @TableId private String storagevehicleext_id; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java index de740b17..f930d511 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java @@ -1,16 +1,29 @@ package org.nl.wms.masterdata_manage.service.vehicle.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.masterdata_manage.MasterEnum; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbBucketrecordMapper; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.IVTEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -25,6 +38,10 @@ import java.util.Map; @Service public class MdPbBucketrecordServiceImpl extends ServiceImpl implements IMdPbBucketrecordService { + + @Autowired + protected IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; // 载具服务 + @Override public Object queryAll(Map whereJson, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); @@ -33,4 +50,32 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, dao.getStoragevehicle_code()) + ); + + dao.setBucket_record_id(IdUtil.getLongId()); + dao.setStoragevehicle_type("1"); // TODO 暂时写死 + dao.setIvt_level(IVTEnum.IVT_LEVEL.code("一级")); + dao.setIs_active("1"); + dao.setQuality_scode(IVTEnum.QUALITY_SCODE.code("待检品")); + dao.setPrint_times(BigDecimal.valueOf(0)); + dao.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setCreate_name(SecurityUtils.getCurrentNickName()); + dao.setCreate_time(DateUtil.now()); + dao.setStoragevehicle_id(Long.valueOf(vehicleDao.getStoragevehicle_id())); + dao.setStoragevehicle_code(vehicleDao.getStoragevehicle_code()); + dao.setMakeup_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setMakeup_optname(SecurityUtils.getCurrentNickName()); + dao.setMakeup_time(DateUtil.now()); + dao.setInstor_optid(Long.valueOf(SecurityUtils.getCurrentUserId())); + dao.setInstor_optname(SecurityUtils.getCurrentNickName()); + dao.setInstor_time(DateUtil.now()); + this.save(dao); + + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java index 60d4bfa6..caf1722d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.jsonwebtoken.lang.Assert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -670,15 +671,18 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { String device_code = param.getString("wcsdevice_code"); //载具编码 String vehicle_code = param.getString("vehicle_code"); + if (StringUtils.isEmpty(vehicle_code)){ + throw new BadRequestException("载具号不能为空"); + } //缓存线位置编码 // 封装给acs的数据 JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); // 1 扫码异常-入箱扫码 2 出箱扫码 jsonObject.put("type", type); -// jsonObject.put("position_code", position_code); jsonObject.put("device_code", device_code); jsonObject.put("vehicle_code", vehicle_code); + vehilematerialService.remove(new QueryWrapper().eq("vehicle_code",vehicle_code)); try { return RestBusinessTemplate.execute(() -> AcsUtil.notifyAcs("api/wms/issuedBarcode", jsonObject)); } catch (NullPointerException e) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index e2aac724..9da7db27 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -8,6 +8,8 @@ import lombok.RequiredArgsConstructor; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.RedissonUtils; +import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.common.utils.api.ResultCode; import org.nl.modules.common.exception.BizCoreException; import org.nl.wms.mps.service.ProduceshiftorderService; @@ -93,7 +95,10 @@ public class ProduceshiftorderController{ @Log("看板开工") @ApiOperation("看板开工") public ResponseEntity openStart(@RequestBody JSONObject param) { - return new ResponseEntity<>(iPdmProduceWorkorderService.openStart(param), HttpStatus.OK); + RedissonUtils.lock(()->{ + iPdmProduceWorkorderService.openStart(param); + },param.getString("workorder_id"),null); + return new ResponseEntity<>(RestBusinessTemplate.execute(() -> new JSONObject()),HttpStatus.OK); } @PostMapping("/saveReport") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java index 8fff62e4..df45e532 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java @@ -50,7 +50,6 @@ public class TaskServiceImpl implements TaskService { HashMap map = new HashMap<>(); map.put("flag", "1"); - JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); String task_status = whereJson.getString("task_status"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java index f1403524..fb325516 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java @@ -97,8 +97,8 @@ public class SpeEmpTask extends AbstractAcsTask { throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code"))); } - JSONObject form = new JSONObject(MapOf.of("start_point_code","", - "next_point_code",param.getString("device_code"),"return_point_code", "","vehicle_code", + JSONObject form = new JSONObject(MapOf.of("start_point_code",cahceLine, + "next_point_code",param.getString("device_code"),"return_point_code", cahceLine,"vehicle_code", "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id())); String taskId = IdUtil.getSnowflake(1, 1).nextId() + ""; JSONObject task = packageParam(form, taskId); @@ -143,7 +143,7 @@ public class SpeEmpTask extends AbstractAcsTask { task.put("task_name", AcsTaskEnum.TASK_CACHELINE_OUT.getDesc()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("task_type", form.getString("type")); - task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode()); + task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); task.put("task_status", TaskStatusEnum.CREATED.getCode()); task.put("point_code1", form.getString("start_point_code")); task.put("point_code2", form.getString("next_point_code")); @@ -216,7 +216,8 @@ public class SpeEmpTask extends AbstractAcsTask { ArrayList Merge = new ArrayList<>(); if (!CollectionUtils.isEmpty(array)){ String pointCollect = array.stream().map(a->a.getPoint_code1() + "','" + a.getPoint_code2()).collect(Collectors.joining("','")); - List> needMergeCollect = basePointService.getAllPointRegin(pointCollect); + List> needMergeCollect = new ArrayList<>(); + //basePointService.getAllPointRegin("'"+pointCollect+"'"); //区域编号对应point_code pointRegionCollent Map>> pointRegionCollent = needMergeCollect.stream().collect(Collectors.groupingBy(o -> o.get("point_code"))); Set mergePointCollent = needMergeCollect.stream().map(item -> item.get("point_code")).collect(Collectors.toSet()); @@ -291,6 +292,17 @@ public class SpeEmpTask extends AbstractAcsTask { if (tag){task.setIs_send(true);tag = false;}else {task.setIs_send(false); } } } + if (value.size() == 1){ + for (SchBaseTask task : value) { + if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK.getCode())){ + task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK.getCode()); + } + if (task.getAcs_task_type().equals(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_DOUBLE_TASK.getCode())){ + task.setAcs_task_type(AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); + } + task.setIs_send(true); + } + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index 8f42c1a6..462a29a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -223,7 +223,6 @@ public class SpeFullTask extends AbstractAcsTask { vehilematerial.setQuantity(task.getMaterial_qty()); cacheLineVechileService.save(vehilematerial); } - break; case STATUS_FINISH: taskService.update(new UpdateWrapper() @@ -251,12 +250,17 @@ public class SpeFullTask extends AbstractAcsTask { .set("update_name", "acs") .set("update_time", DateUtil.now()).eq("task_id", task.getTask_id()); log.info("生坑到料完成："+param.toString()); + taskService.update(wrapper); if (extParam.get("fall_finish") != null){ + //TODO:添加任务唯一性校验防止重复更新 PdmBiDevice one = deviceService.getOne(new QueryWrapper().eq("device_code", task.getPoint_code2())); - deviceService.update(new UpdateWrapper() - .set("material_id", task.getMaterial_id()) - .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty())) - .eq("device_code", task.getPoint_code2())); + if (!one.getRemark().equals("fall_finish"+task.getTask_id())){ + deviceService.update(new UpdateWrapper() + .set("material_id", task.getMaterial_id()) + .set("deviceinstor_qty",one.getDeviceinstor_qty().add(task.getMaterial_qty())) + .set("remark","fall_finish"+task.getTask_id()) + .eq("device_code", task.getPoint_code2())); + } } break; case STATUS_FINISH: diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml index 25a5a89f..49637bba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml @@ -31,7 +31,7 @@ sch_base_point.point_type = '4' and pdm_bi_device.is_used = true and workprocedure_id = #{workprocedure_id} - and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null ) + and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '') and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/rest/TaskController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml index d1c1dd38..bdbeae95 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehicleMapper.xml @@ -10,7 +10,8 @@ sch_cacheline_vehilematerial v LEFT JOIN sch_cacheline_position p ON p.vehicle_code = v.vehicle_code WHERE p.vehicle_code ]]> '' and - v.vehicle_status = #{vehicle_status} + v.vehicle_status = #{vehicle_status} and + p.cacheLine_code = #{cacheLine} and v.material_id = #{material_id} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml index 30e7214c..53367d6c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml @@ -114,10 +114,10 @@ FROM sch_base_region LEFT JOIN sch_base_point ON sch_base_region.region_code = sch_base_point.region_code - LEFT JOIN sch_base_point b ON sch_base_region.region_code = b.region_code AND b.point_code IN ( #{points} ) + LEFT JOIN sch_base_point b ON sch_base_region.region_code = b.region_code AND b.point_code IN ( ${points} ) WHERE sch_base_region.is_merge = '1' - AND sch_base_point.point_code IN ( #{points} ) + AND sch_base_point.point_code IN ( ${points} ) GROUP BY sch_base_point.point_code diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java index 22e6758d..a55a0a33 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java @@ -25,7 +25,7 @@ public enum IOSEnum { //单据状态 WORK_STATUS(MapOf.of("未生成", "00", "生成", "10", "执行中", "20", "完成", "99")), //锁定类型 - LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3")), + LOCK_TYPE(MapOf.of("未锁定", "0", "入库锁", "1", "出库锁", "2","盘点锁", "3","损溢锁", "4")), ; private Map code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index c00e555f..b5413d10 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -455,7 +455,8 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl().lambda() .eq(MdPbStoragevehicleext::getStoragevehicle_code,dao.getStoragevehicle_code()) ); @@ -477,7 +478,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl + order by mst.mol_code DESC + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java index 6776b3d1..4ea55f07 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessdtlCpServiceImpl.java @@ -107,7 +107,7 @@ public class StIvtMoreorlessdtlCpServiceImpl extends ServiceImpl() - .set("lock_type", IOSEnum.LOCK_TYPE.code("盘点锁")) + .set("lock_type", IOSEnum.LOCK_TYPE.code("损溢锁")) .set("inv_code",mst.getMol_code()) .eq("struct_id", row.getStruct_id())); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java index dfe48f1c..c47ee096 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/moreOrLess/impl/StIvtMoreorlessmstCpServiceImpl.java @@ -19,11 +19,17 @@ import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; +import org.nl.wms.masterdata_manage.MasterEnum; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.CHECKEnum; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessdtlCpService; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessmstCpService; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.dao.StIvtMoreorlessdtlCp; @@ -38,6 +44,7 @@ import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.StIvtStructivtY import org.nl.wms.storage_manage.semimanage.MLEnum; 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.List; @@ -66,6 +73,12 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -117,10 +130,28 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().eq("mol_id", id)); dao.setIs_delete(true); this.updateById(dao); + + // 解锁货位 + StIvtMoreorlessdtlCp dtlDao = iStIvtMoreorlessdtlCpService.getOne( + new QueryWrapper().lambda() + .eq(StIvtMoreorlessdtlCp::getMol_id, id), + false + ); + + structattrService.update( + new StIvtStructattr() + .setInv_code("") + .setInv_type("") + .setInv_id("") + .setLock_type(IOSEnum.LOCK_TYPE.code("未锁定")), + new QueryWrapper().lambda() + .eq(StIvtStructattr::getStruct_id, dtlDao.getStruct_id()) + ); } } @Override + @Transactional(rollbackFor = Exception.class) public void confirm(JSONObject whereJson) { String mol_id = (String) whereJson.get("mol_id"); @@ -146,9 +177,64 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(NumberUtil.sub(vehicleDao.getStorage_qty(),mol_qty)); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } + + // 判断是否有箱 + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isNotEmpty(buckDao)) { + // 更新箱重量 + buckDao.setStorage_qty(NumberUtil.sub(buckDao.getStorage_qty(), mol_qty)); + iMdPbBucketrecordService.updateById(buckDao); + } + //如果库存变为0则删除记录 if (canuse_qty.compareTo(mol_qty) == 0 && canuse_qty.compareTo(ivt_qty) == 0) { iStIvtStructivtCpService.removeById(ivt.getStockrecord_id()); + + // 更新箱记录表状态为出库 + iMdPbBucketrecordService.update( + MdPbBucketrecord.builder() + .status(MasterEnum.BOX_STATUS.code("出库")) + .build(), + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + // 更新载具扩展属性 - 释放载具对应物料关系 清空数量 + iMdPbStoragevehicleextService.update( + new MdPbStoragevehicleext() + .setMaterial_id("") + .setStorage_qty(BigDecimal.valueOf(0)), + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code,dtl.getStoragevehicle_code()) + ); + + // 更新货位 -- 清除载具号 + structattrService.update( + new StIvtStructattr() + .setStoragevehicle_code("") + .setInv_id("") + .setInv_type("") + .setInv_code(""), + new QueryWrapper().lambda() + .eq(StIvtStructattr::getStruct_id, ivt.getStruct_id()) + ); + } else { iStIvtStructivtCpService.updateById(ivt); } @@ -177,12 +263,99 @@ public class StIvtMoreorlessmstCpServiceImpl extends ServiceImpl().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(mol_qty); + vehicleDao.setMaterial_id(dtl.getMaterial_id()); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } + + // 判断是否有箱 + if (ObjectUtil.isNotEmpty(dtl.getBucketunique())) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isEmpty(buckDao)) { + // 新增一条箱记录 + MdPbBucketrecord param = MdPbBucketrecord.builder() + .bucketunique(dtl.getBucketunique()) + .material_id(dtl.getMaterial_id()) + .pcsn(dtl.getPcsn()) + .qty_unit_id(Long.valueOf(dtl.getQty_unit_id())) + .qty_unit_name(dtl.getQty_unit_name()) + .storage_qty(dtl.getMol_qty()) + .status(MasterEnum.BOX_STATUS.code("入库")) + .storagevehicle_code(dtl.getStoragevehicle_code()) + .build(); + + iMdPbBucketrecordService.createBucke(param); + } else { + buckDao.setStorage_qty(dtl.getMol_qty()); + buckDao.setStatus(MasterEnum.BOX_STATUS.code("入库")); + iMdPbBucketrecordService.updateById(buckDao); + } + } + } else { + BigDecimal canuse_qty = ivt.getCanuse_qty(); BigDecimal ivt_qty = ivt.getIvt_qty(); + + // 更新库存 ivt.setCanuse_qty(NumberUtil.add(canuse_qty, mol_qty)); ivt.setIvt_qty(NumberUtil.add(ivt_qty, mol_qty)); iStIvtStructivtCpService.updateById(ivt); + + // 判断是否有箱 + if (ObjectUtil.isNotEmpty(dtl.getBucketunique())) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getBucketunique, dtl.getBucketunique()) + .eq(MdPbBucketrecord::getMaterial_id, dtl.getMaterial_id()) + ); + + if (ObjectUtil.isEmpty(buckDao)) { + // 新增一条箱记录 + MdPbBucketrecord param = MdPbBucketrecord.builder() + .bucketunique(dtl.getBucketunique()) + .material_id(dtl.getMaterial_id()) + .pcsn(dtl.getPcsn()) + .qty_unit_id(Long.valueOf(dtl.getQty_unit_id())) + .qty_unit_name(dtl.getQty_unit_name()) + .storage_qty(dtl.getMol_qty()) + .status(MasterEnum.BOX_STATUS.code("入库")) + .storagevehicle_code(dtl.getStoragevehicle_code()) + .build(); + + iMdPbBucketrecordService.createBucke(param); + } else { + buckDao.setStorage_qty(NumberUtil.add(buckDao.getStorage_qty(), dtl.getMol_qty())); + buckDao.setStatus(MasterEnum.BOX_STATUS.code("入库")); + iMdPbBucketrecordService.updateById(buckDao); + } + } + + // 更新载具扩展属性 - 数量 + MdPbStoragevehicleext vehicleDao = iMdPbStoragevehicleextService.getOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(vehicleDao)) { + vehicleDao.setStorage_qty(NumberUtil.add(vehicleDao.getStorage_qty(), dtl.getMol_qty())); + iMdPbStoragevehicleextService.updateById(vehicleDao); + } } //更新明细状态 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java index 8dea72fd..8f4dc19a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java @@ -25,4 +25,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper { List getStructIvtMore(@Param("query") StructIvtYLQuery query); + List getStructIvtMoreBox(JSONObject json); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml index 144559fa..4c9bf7f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml @@ -74,6 +74,7 @@ sa.struct_id, sa.struct_code, sa.struct_name, + sa.storagevehicle_code, class.class_name FROM ST_IVT_StructIvt_CP ivt @@ -97,4 +98,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java index 48111148..78a2a1ba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java @@ -10,6 +10,8 @@ import org.nl.common.utils.IdUtil; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; +import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; @@ -43,6 +45,9 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl getStructIvtMore(StructIvtYLQuery whereJson) { - return this.baseMapper.getStructIvtMore(whereJson); + // 判断货位是否有箱 + List structIvtList = this.baseMapper.getStructIvtMore(whereJson); + + if (ObjectUtil.isNotEmpty(structIvtList)) { + MdPbBucketrecord buckDao = iMdPbBucketrecordService.getOne( + new QueryWrapper().lambda() + .eq(MdPbBucketrecord::getStoragevehicle_code, structIvtList.get(0).get("storagevehicle_code")), + false + ); + + if (ObjectUtil.isNotEmpty(buckDao)) { + JSONObject param = new JSONObject(); + param.put("storagevehicle_code",structIvtList.get(0).get("storagevehicle_code")); + param.put("struct_code",structIvtList.get(0).get("struct_code")); + structIvtList = this.baseMapper.getStructIvtMoreBox(param); + } + } + return structIvtList; } /* diff --git a/mes/hd/nladmin-system/src/main/resources/scheduler.xml b/mes/hd/nladmin-system/src/main/resources/scheduler.xml index 0198fab3..b9aa5b65 100644 --- a/mes/hd/nladmin-system/src/main/resources/scheduler.xml +++ b/mes/hd/nladmin-system/src/main/resources/scheduler.xml @@ -8,11 +8,9 @@ - + - - diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 77547392..7b58e463 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -132,11 +132,12 @@ /> + - + 任务调度 + -