diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml index b27f32c6..48c80fe6 100644 --- a/mes/hd/nladmin-system/pom.xml +++ b/mes/hd/nladmin-system/pom.xml @@ -27,7 +27,23 @@ 1.9 + + + org.apache.poi + poi + 4.0.0 + + + org.apache.poi + poi-ooxml + 4.0.0 + + + org.apache.poi + poi-ooxml-schemas + 4.0.0 + org.jetbrains @@ -364,12 +380,6 @@ 0.1.55 - - - com.alibaba - easyexcel - 2.2.6 - mysql mysql-connector-java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java index 99c21374..32cd6204 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -9,6 +9,7 @@ import java.util.Date; import org.nl.common.enums.QueryTEnum; import org.nl.common.utils.MapOf; +import org.springframework.format.annotation.DateTimeFormat; import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; import java.lang.reflect.Type; @@ -33,8 +34,8 @@ public class BaseQuery { /** * 创建时间范围查询 */ - private Date start_time; - private Date end_time; + private String start_time; + private String end_time; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java index 61e88cc9..cf0af3b1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/domain/query/PageQuery.java @@ -45,15 +45,15 @@ public class PageQuery implements Serializable { /** * 当前记录起始索引 默认值 */ - public static final int DEFAULT_PAGE_NUM = 1; + public static final int DEFAULT_PAGE_NUM = 0; /** * 每页显示记录数 默认值 默认查全部 */ - public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; + public static final int DEFAULT_PAGE_SIZE = 10; public Page build() { - Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM) + 1; + Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE); if (pageNum <= 0) { pageNum = DEFAULT_PAGE_NUM; @@ -75,10 +75,7 @@ public class PageQuery implements Serializable { public Page build(Class r) { Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getSize(), DEFAULT_PAGE_SIZE); - if (pageNum <= 0) { - pageNum = DEFAULT_PAGE_NUM; - } - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum+1, pageSize); if (StringUtils.isNotBlank(sort)){ String[] split = sort.split(","); for (int i = 0; i < (split.length & ~1); i=i+2) { 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 71ddfbd8..b894c96a 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 @@ -63,7 +63,9 @@ public enum AcsTaskEnum { ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), + 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/config/mybatis/CodeGenerator.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 960f43a4..91d8e99a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -57,10 +57,10 @@ public class CodeGenerator { mpg.setGlobalConfig(gc); // 数据源配置 DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://192.168.81.252:3306/hl_one_mes_xc?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); + dsc.setUrl("jdbc:mysql://192.168.46.5:3306/hl_one_mes_test?serverTimezone=GMT&setUnicode=true&characterEncoding=utf8"); dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername("root"); - dsc.setPassword("Root.123456"); + dsc.setPassword("123456"); mpg.setDataSource(dsc); // 包配置 PackageConfig pc = new PackageConfig(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java index c5ef87d3..73d35fc0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -21,9 +21,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import org.nl.common.utils.SecurityUtils; +import lombok.RequiredArgsConstructor; import org.nl.modules.common.config.FileProperties; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.*; @@ -146,12 +144,7 @@ public class LocalStorageServiceImpl implements LocalStorageService { @Override @Transactional(rollbackFor = Exception.class) public void importExcel(String path) { - WQLObject measureunitTab = WQLObject.getWQLObject("md_pb_measureunit"); - WQLObject materialbaseTab = WQLObject.getWQLObject("md_me_materialbase"); - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - //List> listMap = EasyExcel.read(path).sheet(1).doReadSync(); List> listMap = new ArrayList<>(); for (int i = 3; i < listMap.size(); i++) { Map map = listMap.get(i); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java similarity index 69% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java index 61259398..272be715 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java @@ -1,13 +1,21 @@ -package org.nl.wms.mps.rest; +package org.nl.wms.device_manage.controller.userdevice; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.jsonwebtoken.lang.Assert; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService; +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; import org.nl.wms.mps.service.PersoncorrdeviceService; import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; import org.springframework.data.domain.Pageable; @@ -16,6 +24,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; import java.util.Map; /** @@ -30,50 +40,43 @@ import java.util.Map; public class PersoncorrdeviceController { private final PersoncorrdeviceService personcorrdeviceService; + private final IPdmBiPersoncorrdeviceService pdmBiPersoncorrdeviceService; @GetMapping @Log("查询人员设备维护") @ApiOperation("查询人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(personcorrdeviceService.queryAll(whereJson,page),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map query, PageQuery page){ + Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List list = pdmBiPersoncorrdeviceService.queryAll(query); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(result.getTotal()); + return new ResponseEntity<>(build,HttpStatus.OK); } @PostMapping @Log("新增人员设备维护") @ApiOperation("新增人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:add')") - public ResponseEntity create(@Validated @RequestBody PersoncorrdeviceDto dto){ - personcorrdeviceService.create(dto); + public ResponseEntity create(@RequestBody JSONObject entity){ + Assert.notNull(entity,"请求参数不能为空"); + PdmBiPersoncorrdevice pdmBiPersoncorrdevice = entity.toJavaObject(PdmBiPersoncorrdevice.class); + pdmBiPersoncorrdevice.setId(IdUtil.getStringId()); + pdmBiPersoncorrdeviceService.save(pdmBiPersoncorrdevice); return new ResponseEntity<>(HttpStatus.CREATED); } - @PutMapping - @Log("修改人员设备维护") - @ApiOperation("修改人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:edit')") - public ResponseEntity update(@Validated @RequestBody PersoncorrdeviceDto dto){ - personcorrdeviceService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } @Log("删除人员设备维护") @ApiOperation("删除人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { - personcorrdeviceService.deleteAll(ids); + if (ids != null && ids.length>0){ + pdmBiPersoncorrdeviceService.removeByIds(Arrays.asList(ids)); + } return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping("/addPersons") - @Log("添加人员") - @ApiOperation("添加人员") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity addPersons(@RequestBody JSONObject param) { - personcorrdeviceService.addPersons(param); - return new ResponseEntity<>( HttpStatus.OK); - } @GetMapping("/getDeviceByPerson") @Log("查询设备") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java new file mode 100644 index 00000000..d4b836ce --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java @@ -0,0 +1,83 @@ +package org.nl.wms.device_manage.service.userdevice; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 人员设备关系表 服务类 + *

+ * + * @author generator + * @since 2023-06-06 + */ +public interface IPdmBiPersoncorrdeviceService extends IService { + + + /** + * 查询数据分页 + * @param whereJson 条件 + * @return Map + */ + List queryAll(Map whereJson); + + + /** + * 根据ID查询 + * @param team_person_device_id ID + * @return Personcorrdevice + */ + PersoncorrdeviceDto findById(Long team_person_device_id); + + /** + * 根据编码查询 + * @param code code + * @return Personcorrdevice + */ + PersoncorrdeviceDto findByCode(String code); + + + /** + * 创建 + * @param dto / + */ + void create(PersoncorrdeviceDto dto); + + /** + * 编辑 + * @param dto / + */ + void update(PersoncorrdeviceDto dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); + + void addPersons(JSONObject param); + + /** + * 设备 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map getDeviceByPerson(Map whereJson, Pageable page); + + Map getHeader(JSONObject param); + + JSONArray getDeviceIdByUserId(JSONObject param); + + void addDevices(JSONObject param); + + void deleteRow(JSONObject param); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java new file mode 100644 index 00000000..ba887e34 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java @@ -0,0 +1,37 @@ +package org.nl.wms.device_manage.service.userdevice.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 人员设备关系表 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_personcorrdevice") +public class PdmBiPersoncorrdevice implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id") + private String id; + /** + * 用户id + */ + private String user_id; + + /** + * 设备标识 + */ + private String device_code; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java new file mode 100644 index 00000000..09753fe3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java @@ -0,0 +1,20 @@ +package org.nl.wms.device_manage.service.userdevice.dao.mapper; + +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 人员设备关系表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-06 + */ +public interface PdmBiPersoncorrdeviceMapper extends BaseMapper { + + List queryAll(Map query); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml new file mode 100644 index 00000000..48fe08c2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java new file mode 100644 index 00000000..0ed1305e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java @@ -0,0 +1,88 @@ +package org.nl.wms.device_manage.service.userdevice.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper; +import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 人员设备关系表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-06 + */ +@Service +public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl implements IPdmBiPersoncorrdeviceService { + + @Override + public List queryAll(Map query) { + this.baseMapper.queryAll(query); + return null; + } + + @Override + public PersoncorrdeviceDto findById(Long team_person_device_id) { + return null; + } + + @Override + public PersoncorrdeviceDto findByCode(String code) { + return null; + } + + @Override + public void create(PersoncorrdeviceDto dto) { + + } + + @Override + public void update(PersoncorrdeviceDto dto) { + + } + + @Override + public void deleteAll(Long[] ids) { + + } + + @Override + public void addPersons(JSONObject param) { + + } + + @Override + public Map getDeviceByPerson(Map whereJson, Pageable page) { + return null; + } + + @Override + public Map getHeader(JSONObject param) { + return null; + } + + @Override + public JSONArray getDeviceIdByUserId(JSONObject param) { + return null; + } + + @Override + public void addDevices(JSONObject param) { + + } + + @Override + public void deleteRow(JSONObject param) { + + } +} 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 847697f4..5b91a24d 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 @@ -100,6 +100,15 @@ public class AcsToWmsController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/feedDeviceQty2") + @ApiOperation("反馈深坑数量") + @SaIgnore + @Log("反馈深坑数量") + public ResponseEntity feedDeviceRealQty2(@RequestBody Map param) { + acsToWmsService.feedDevQty2(param); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/feedCacheLineBarcodes") @Log("向wms反馈缓存载具信息") @ApiOperation("向wms反馈缓存载具信息") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index a721fa7b..3992c8a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -60,6 +60,7 @@ public interface AcsToWmsService { * @return */ void feedDevQty(Map param); + void feedDevQty2(Map param); /** * ACS给WMS反馈设备状态状态 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index bcd88c72..7243ee12 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -5,6 +5,8 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; @@ -26,6 +28,8 @@ import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.service.TaskService; import org.nl.wms.product_manage.sch.service.dto.TaskDto; import org.nl.wms.product_manage.sch.tasks.WashMachineryTask; +import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; +import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; @@ -37,8 +41,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -47,34 +53,37 @@ import java.util.function.Consumer; @Service @Slf4j -public class AcsToWmsServiceImpl implements AcsToWmsService { +public class AcsToWmsServiceImpl implements AcsToWmsService{ public static Map Task_Collent = new HashMap<>(); @Autowired @Lazy - private TaskService taskService; + private TaskService taskService; @Autowired - private CacheLineHandService cacheLineHandService; + private CacheLineHandService cacheLineHandService; @Autowired private IPdmProduceWorkorderService workorderService; + @Autowired + private IPdmBiDeviceService deviceService; + + @Override public Map apply(JSONObject param) { - Assert.notNull(param, "请求参数不能为空"); + Assert.notNull(param,"请求参数不能为空"); Map result = MapOf.of("status", HttpStatus.OK.value(), "message", "ACS向WMS申请任务成功!"); AcsTaskEnum taskEnum = AcsTaskEnum.getType(param.getString("type"), "REQUEST_"); try { - RedissonUtils.lock(() -> { + RedissonUtils.lock(()->{ //业务处理 Task_Collent.get(taskEnum).createTask(param); - - }, param.getString("type"), 5); - } catch (Exception ex) { - log.error("acs申请任务失败:ex:{}", ex.getMessage()); + },param.getString("type"),5); + }catch (Exception ex){ + log.error("acs申请任务失败:ex:{}",ex.getMessage()); result.put("status", HttpStatus.BAD_REQUEST.value()); - result.put("message", ex.getMessage()); + result.put("message",ex.getMessage()); } return result; } @@ -83,13 +92,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { /** * 更新缓存线的点位实时任务信息 * ACS给WMS发送缓存线的实时任务编号 - * * @param jsonObject position_code：缓存线点位编码 task_code：任务编号 */ @Override public JSONObject receiveTaskIdToCacheLine(JSONObject jsonObject) { JSONObject result = new JSONObject(); - HashMap json = new HashMap<>(2); + HashMap json = new HashMap<>(2); try { String task_code = jsonObject.getString("task_code"); String positionCode = jsonObject.getString("position_code"); @@ -99,7 +107,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { json.put("task_code", task_code); //更新缓存线的点位实时任务信息 positionTab.update(json); - } catch (Exception e) { + } + catch(Exception e) { result.put("status", 400); result.put("message", e.getMessage()); } @@ -129,21 +138,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String status = row.getString("status"); // 任务处理类 try { - //发布一个任务执行事件 + + AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class)); + if (taskHandler!=null){ + taskHandler.updateTaskStatus(row,status); + } + //发布一个任务执行事件:服务跟任务不一样，可以同事存在 TaskEvent event = TaskEvent.builder() .task_id(task_id) .task_type(taskDto.getTask_type()) .status(status) .build(); BussEventMulticaster.Publish(event); - - if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) { - taskDto.setIs_delete("1"); - taskService.update(taskDto); - } - - /*AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class)); - taskHandler.updateTaskStatus(row,status);*/ } catch (Exception e) { log.error("任务状态更新失败:{}", e.getMessage()); JSONObject json = new JSONObject(); @@ -185,8 +191,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { public Map washOrderFinish(JSONObject param) { JSONObject result = new JSONObject(); try { - SpringContextHolder.getBean(WashMachineryTask.class).updateTaskStatus(param, StatusEnum.TASK_FINISH.getCode()); - } catch (Exception e) { + SpringContextHolder.getBean(WashMachineryTask.class).updateTaskStatus(param,StatusEnum.TASK_FINISH.getCode()); + } catch (Exception e){ result.put("status", 400); result.put("message", e.getMessage()); return result; @@ -203,18 +209,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { PdmProduceWorkorder workorder = new PdmProduceWorkorder(); workorder.setWorkorder_id(orderJson.getString("workorder_id")); workorder.setWorkorder_status(orderJson.getString("status")); - if (orderJson.getBigDecimal("real_qty") != null) { + if (orderJson.getBigDecimal("real_qty") != null){ workorder.setDq_real_qty(orderJson.getBigDecimal("real_qty")); } - if (orderJson.getString("status").equals(WorkerOrderEnum.PRODUCTING.getCode())) { + if (orderJson.getString("status").equals(WorkerOrderEnum.PRODUCTING.getCode())){ workorder.setRealproducestart_date(DateUtil.now()); } - if (orderJson.getString("status").equals(WorkerOrderEnum.COMPLETE.getCode())) { + if (orderJson.getString("status").equals(WorkerOrderEnum.COMPLETE.getCode())){ workorder.setWorkorder_status(WorkerOrderEnum.AUTO_COMPLETE.getCode()); workorder.setRealproduceend_date(DateUtil.now()); } workorderService.updateById(workorder); - } catch (Exception e) { + } catch (Exception e){ log.error("工单状态更新失败:{}", e.getMessage()); result.put("status", 400); result.put("message", e.getMessage()); @@ -238,11 +244,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String start_time = param.getString("start_time"); String err_status_id = param.getString("error_code");//关联pdm_bi_devicerunerrorlink获取异常信息 JSONObject lastRecord = devRecordTab.query("device_code = '" + device_code + "' order by order_num desc limit 1").uniqueResult(0); - if (lastRecord != null) { - lastRecord.put("end_time", DateUtil.now()); + if (lastRecord!=null){ + lastRecord.put("end_time",DateUtil.now()); devRecordTab.update(lastRecord); } - devRecordTab.insert(MapOf.of("record_id", IdUtil.getStringId(), "device_code", device_code, "status_type", status_type, "start_time", start_time, "err_status_id", err_status_id)); + devRecordTab.insert(MapOf.of("record_id", IdUtil.getStringId(),"device_code",device_code,"status_type",status_type,"start_time",start_time,"err_status_id",err_status_id)); result.put("status", HttpStatus.OK.value()); result.put("message", "设备状态反馈成功"); return result; @@ -251,16 +257,49 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Async public void feedDevQty(Map param) { - WQLObject deviceTab = WQLObject.getWQLObject("pdm_bi_device"); - if (CollectionUtils.isEmpty(param)) { + if (CollectionUtils.isEmpty(param)){ return; } + log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param)); Iterator iterator = param.keySet().iterator(); - while (iterator.hasNext()) { - String deviceCode = (String) iterator.next(); - if (!StringUtils.isEmpty(deviceCode)) { - String qty = String.valueOf(param.get(deviceCode)); - deviceTab.update(MapOf.of("deviceinstor_qty", qty), "device_code = '" + deviceCode + "'"); + while (iterator.hasNext()){ + String deviceCode = (String)iterator.next(); + if (!StringUtils.isEmpty(deviceCode)){ + if (deviceCode.contains("SKQX")){ + continue; + } + Map item = (Map)param.get(deviceCode); + Object qty = item.get("qty"); + Object weight = item.get("weight"); + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.set("deviceinstor_qty",qty); + if (weight!=null){ + wrapper.set("deviceinstor_weight",weight); + } + wrapper.eq("device_code",deviceCode); + deviceService.update(wrapper); + } + } + } + @Override + public void feedDevQty2(Map param) { + if (CollectionUtils.isEmpty(param)){ + return; + } + log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param)); + Iterator iterator = param.keySet().iterator(); + while (iterator.hasNext()){ + String deviceCode = (String)iterator.next(); + if (!StringUtils.isEmpty(deviceCode)){ + Map item = (Map)param.get(deviceCode); + Object qty = item.get("qty"); + Object weight = item.get("weight"); + UpdateWrapper wrapper = new UpdateWrapper<>(); + if (weight!=null){ + wrapper.set("deviceinstor_weight",weight); + wrapper.eq("device_code",deviceCode); + deviceService.update(wrapper); + } } } } @@ -268,7 +307,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public void feedcachelineVe(JSONObject param) { WQLObject positionTab = WQLObject.getWQLObject("sch_cacheline_position"); - if (param == null || StringUtils.isBlank(param.getString("device_code")) || StringUtils.isBlank(param.getString("vehicle_code"))) { + if (param == null|| StringUtils.isBlank(param.getString("device_code")) || StringUtils.isBlank(param.getString("vehicle_code"))){ return; } String cachelineCode = param.getString("device_code"); @@ -276,17 +315,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String[] collect = cacheVehicle.split(","); //order by layer_num,order_no ASC JSONArray cachePositions = positionTab.query("cacheLine_code = '" + cachelineCode + "' order by layer_num,order_no ASC").getResultJSONArray(0); - if (cachePositions.size() != collect.length) { + if (cachePositions.size() != collect.length){ throw new BadRequestException("缓存线位置数量与acs返回数量不一致"); } for (int i = 0; i < cachePositions.size(); i++) { JSONObject cachePosition = (JSONObject) cachePositions.get(i); String vehicleCode = collect[i]; - cachePosition.put("vehicle_code", vehicleCode.equals("0") ? "" : vehicleCode); - if (vehicleCode.equals("99999")) { + cachePosition.put("vehicle_code",vehicleCode.equals("0")?"": vehicleCode); + if (vehicleCode.equals("99999")){ cachePosition.put("err_type", StatusEnum.CACHE_POINT_ERROR.getCode()); } - positionTab.update(cachePosition, "position_code = '" + cachePosition.getString("position_code") + "'"); + positionTab.update(cachePosition,"position_code = '"+cachePosition.getString("position_code")+"'"); } //更新缓存线及缓存线载具表对应关系 cacheLineHandService.cacheLineMaterSync(param.getString("cacheline_code")); @@ -295,15 +334,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Async public void feedOrderRealQty(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder"); - if (CollectionUtils.isEmpty(param)) { + if (CollectionUtils.isEmpty(param)){ return; } Iterator iterator = param.keySet().iterator(); - while (iterator.hasNext()) { + while (iterator.hasNext()){ String workorderCode = iterator.next(); - String real_qty = param.getString(workorderCode); - wo.update(MapOf.of("real_qty", real_qty), "workorder_code = '" + workorderCode + "'"); + BigDecimal dq_real_qty = param.getBigDecimal(workorderCode); + workorderService.update(new UpdateWrapper() + .set("dq_real_qty",dq_real_qty).eq("workorder_code",workorderCode)); } } } 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 50b5c3cd..d67e8937 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 @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -78,14 +79,17 @@ public class AgvInstService { Map query = MapOf.of("workprocedure_id", basePointService.getWorkprodureByCode(next.getId()).get("workprocedure_id") , "qty", quantity,"spec",workprodure.get("spec")); //判断缓存线是不是去深坑清洗：深坑区域15个点：判断空的物料坑位： + List> collect = new ArrayList<>(); if (next.getName().equals("深坑清洗")){ - query.put("material_id",task.getString("material_id")); -// query.put("qty",quantity) 深坑物料需要转重量 task.put("task_type",AcsTaskEnum.TASK_PRODUCT_WASH.getCode()); task.put("task_name",AcsTaskEnum.TASK_PRODUCT_WASH.getDesc()); - + query.put("material_id",task.getString("material_id")); +// query.put("qty",quantity) 深坑物料需要转重量 + collect = deviceService.workproceduceDevicesWeight(query); + }else { + collect = deviceService.workproceduceDevicesQty(query); } - List> collect = deviceService.workproceduceDevices(query); + log.info("调度任务分配点位信息：", JSON.toJSONString(collect)); List> list = collect.stream().filter(stringStringMap -> stringStringMap.get("tasks") == null || stringStringMap.get("materials").contains(task.getString("material_id"))).collect(Collectors.toList()); task.put("acs_task_type",AcsTaskEnum.ACS_TASK_TYPE_NOBLE_SINGLE_TASK.getCode()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java index c3b8b341..91c4e64b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java @@ -30,14 +30,12 @@ public class AgvBigScreenController { private final AgvBigScreenService agvBigScreenService; @PostMapping("/getTask") - @Log("查询任务") @ApiOperation("查询任务") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getTask(whereJson), HttpStatus.OK); } @PostMapping("/getAgvMsg") - @Log("查询车辆信息") @ApiOperation("查询车辆信息") public ResponseEntity getAgvMsg(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getAgvMsg(whereJson), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java index bef7d3f9..27e350ea 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.bigScreen.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,24 +24,22 @@ import java.util.Map; @Api(tags = "监控大屏") @RequestMapping("/api/bigScreenScreen") @Slf4j +@SaIgnore @CrossOrigin public class BigScreenController { private final BigScreenService bigScreenService; @PostMapping("/zk") - @Log("查询中控室监控大屏") @ApiOperation("查询中控室监控大屏") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.getData(whereJson), HttpStatus.OK); } @PostMapping("/query3Dcartoon") - @Log("查询三维动画大屏") @ApiOperation("查询三维动画大屏") public ResponseEntity query3Dcartoon(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.query3Dcartoon(whereJson), HttpStatus.OK); } @PostMapping("/workScreen") - @Log("查询工序看板") @ApiOperation("查询工序看板") public ResponseEntity workScreen(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.workScreen(whereJson), HttpStatus.OK); @@ -48,14 +47,12 @@ public class BigScreenController { @GetMapping("/queryInfo") - @Log("查询中控室监控大屏手动设置数据") @ApiOperation("查询中控室监控大屏手动设置数据") public ResponseEntity queryInfo(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(bigScreenService.queryInfo(whereJson,page), HttpStatus.OK); } @PostMapping("/add") - @Log("手动添加监控大屏数据") @ApiOperation("手动添加监控大屏数据") public ResponseEntity add(@RequestBody JSONObject param) throws Exception { bigScreenService.add(param); @@ -64,7 +61,6 @@ public class BigScreenController { @PutMapping("/edit") - @Log("手动修改监控大屏数据") @ApiOperation("手动修改监控大屏数据") public ResponseEntity edit(@RequestBody JSONObject param) throws Exception { bigScreenService.edit(param); @@ -72,7 +68,6 @@ public class BigScreenController { } @DeleteMapping("/del") - @Log("手动删除监控大屏数据") @ApiOperation("手动删除监控大屏数据") public ResponseEntity del(@RequestBody Long[] ids) throws Exception { bigScreenService.del(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java index 7ec9ae86..54faceba 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.bigScreen.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,75 +19,66 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor @Api(tags = "设备监控大屏") @RequestMapping("/api/deviceScreen") +@SaIgnore @Slf4j public class DeviceScreenController { private final DeviceScreenService deviceScreenService; @PostMapping("/deviceStatus") - @Log("设备实时状态") @ApiOperation("设备实时状态") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatus(whereJson), HttpStatus.OK); } @PostMapping("/oeeAndTeep") - @Log("设备综合效率OEE&产能利用效率TEEP") @ApiOperation("设备综合效率OEE&产能利用效率TEEP") public ResponseEntity oeeAndTeep(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.oeeAndTeep(whereJson), HttpStatus.OK); } @PostMapping("/queryDeviceByWork") - @Log("运行设备大类产能比") @ApiOperation("运行设备大类产能比") public ResponseEntity queryDeviceByWork(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.queryDeviceByWork(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorNum") - @Log("设备TOP10故障次数") @ApiOperation("设备TOP10故障次数") public ResponseEntity deviceErrorNum(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorNum(whereJson), HttpStatus.OK); } @PostMapping("/deviceManage") - @Log("设备管理") @ApiOperation("设备管理") public ResponseEntity deviceManage(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceManage(whereJson), HttpStatus.OK); } @PostMapping("/deviceCensus") - @Log("设备综合统计") @ApiOperation("设备综合统计") public ResponseEntity deviceCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceCensus(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorInfo") - @Log("设备报警信息") @ApiOperation("设备报警信息") public ResponseEntity deviceErrorInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorInfo(whereJson), HttpStatus.OK); } @PostMapping("/deviceUseRate") - @Log("设备产能利用") @ApiOperation("设备产能利用") public ResponseEntity deviceUseRate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceUseRate(whereJson), HttpStatus.OK); } @PostMapping("/deviceStatusList") - @Log("设备状态列表") @ApiOperation("设备状态列表") public ResponseEntity deviceStatusList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatusList(whereJson), HttpStatus.OK); } @PostMapping("/errCensus") - @Log("近30天设备故障统计") @ApiOperation("近30天设备故障统计") public ResponseEntity errCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.errCensus(whereJson), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java index 4f5e8924..8669419a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java @@ -2,6 +2,7 @@ package org.nl.wms.ext.bigScreen.rest; +import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -26,56 +27,49 @@ import java.util.Map; @RequiredArgsConstructor @Api(tags = "大屏生产监控中心") @RequestMapping("/api/bigscreen/product") +@SaIgnore @Slf4j -public class ProductController { +public class ProductController { private final ProductService pdaBindingService; @PostMapping("/planReached") - @Log("计划达成") @ApiOperation("计划达成") public ResponseEntity planReached(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.planReached(param), HttpStatus.OK); } @PostMapping("/productSchedule") - @Log("今日排产生产进度跟踪") @ApiOperation("今日排产生产进度跟踪") public ResponseEntity productSchedule(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.productSchedule(param), HttpStatus.OK); } @PostMapping("/output") - @Log("今日产量") @ApiOperation("今日产量") public ResponseEntity output(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.output(param), HttpStatus.OK); } @PostMapping("/worksectionHarvest") - @Log("近一周工段产量") @ApiOperation("近一周工段产量") public ResponseEntity worksectionHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.worksectionHarvest(param), HttpStatus.OK); } @PostMapping("/topHarvest") - @Log("今日Top10产量") @ApiOperation("今日Top10产量") public ResponseEntity topHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.topHarvest(param), HttpStatus.OK); } @PostMapping("/monthHarvest") - @Log("30天产量走势") - @ApiOperation("30天产量走势") + @ApiOperation("30天产量走势") public ResponseEntity monthHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthHarvest(param), HttpStatus.OK); } @PostMapping("/unfinishOrder") - @Log("今日未完成订单") @ApiOperation("今日未完成订单") public ResponseEntity unfinishOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.unfinishOrder(param), HttpStatus.OK); } @PostMapping("/monthOrder") - @Log("30天生产订单分布") @ApiOperation("30天生产订单分布") public ResponseEntity monthOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthOrder(param), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java index 1e846f08..689cbad4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java @@ -2,6 +2,7 @@ package org.nl.wms.ext.sap.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -30,6 +31,7 @@ import java.util.Map; @Api(tags = "wms发送sap") @RequestMapping("/api/sap/") @Slf4j +@SaIgnore public class WmsToSapController { private final WmsToSapService wmsToSapService; @@ -50,6 +52,7 @@ public class WmsToSapController { @PostMapping("/getDeliveryNote") @Log("获取物料基础信息") @ApiOperation("获取物料基础信息") + @SaIgnore public ResponseEntity getDeliveryNote(@RequestBody JSONObject form) { return new ResponseEntity<>(wmsToSapService.getDeliveryNote(form), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java index cb21270e..04845b9c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java @@ -23,6 +23,7 @@ import org.nl.wms.product_manage.备份pdm.service.DeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,26 +44,22 @@ public class SpecialDeviceController { @Autowired private IPdmBiDeviceService iDeviceService; - @PostMapping("/query") + @GetMapping("/query") @ApiOperation("查询生产设备") + @Log("深坑物料") @SaIgnore - public ResponseEntity query(@RequestBody DeviceQuery query) { - List list = iDeviceService.list(query.build()); - Set materials = list.stream().map(PdmBiDevice::getMaterial_id).collect(Collectors.toSet()); - Map materialMap = materialbaseService.list(new QueryWrapper().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll); - List result = new ArrayList<>(); - for (PdmBiDevice pdmBiDevice : list) { - Map map = new HashMap<>(); - map.put("device_code",pdmBiDevice.getDevice_code()); - map.put("product_area",pdmBiDevice.getProduct_area()); - map.put("material_id",pdmBiDevice.getMaterial_id()); - MdMeMaterialbase materialbase = materialMap.get("pdmBiDevice.getMaterial_id()"); - map.put("material_name",materialbase!=null?materialbase.getMaterial_name():""); - map.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():""); - map.put("deviceinstor_qty",pdmBiDevice.getDeviceinstor_qty()); - result.add(map); + public ResponseEntity query(DeviceQuery query,PageQuery page) { + Page> list = iDeviceService.pageMaps(page.build(PdmBiDevice.class), query.build()); + if (!CollectionUtils.isEmpty(list.getRecords())){ + Set materials = list.getRecords().stream().map(a->a.get("material_id")).collect(Collectors.toSet()); + Map materialMap = materialbaseService.list(new QueryWrapper().in("material_id", materials)).stream().collect(HashMap::new, (k, v) -> k.put(v.getMaterial_id(), v), HashMap::putAll); + for (Map pdmBiDevice : list.getRecords()) { + MdMeMaterialbase materialbase = materialMap.get(pdmBiDevice.get("material_id")); + pdmBiDevice.put("material_name",materialbase!=null?materialbase.getMaterial_name():""); + pdmBiDevice.put("material_spec",materialbase!=null?materialbase.getMaterial_spec():""); + } } - return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @PostMapping("/update") @@ -75,9 +72,10 @@ public class SpecialDeviceController { iDeviceService.update(new UpdateWrapper() .set("material_id",query.getString("material_id")) .set("deviceinstor_qty",query.getBigDecimal("deviceinstor_qty")) + .set("deviceinstor_weight",query.getBigDecimal("deviceinstor_weight")) .eq("device_code",device_code)); } - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index b5cf33bd..f3232273 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -5,6 +5,8 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -12,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; @@ -26,9 +29,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Arrays; -import java.util.Date; import java.util.List; +import java.util.Map; /** *

@@ -117,8 +121,10 @@ public class PdmProduceWorkorderController { @PostMapping("/excelImport") @Log("excel导入") @ApiOperation("excel导入") - public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { - iPdmProduceWorkorderService.excelImport(file,request); + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { + RedissonUtils.lock(()->{ + iPdmProduceWorkorderService.excelImport(file,request, response); + },"工单导入",null); return new ResponseEntity<>(HttpStatus.OK); } @@ -146,15 +152,29 @@ public class PdmProduceWorkorderController { @PostMapping("/reportQuery") - @Log("报工数修改") + @Log("一体机报工数修改") @ApiOperation("报工数修改") @SaIgnore public ResponseEntity reportQuery(@RequestBody ReportQuery param) { + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.setUser_id(SecurityUtils.getCurrentUserId()); + } return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK); } - - - + @GetMapping("/reportQuery2") + @Log("报工数修改") + @ApiOperation("报工数修改") + @SaIgnore + public ResponseEntity reportQuery2(ReportQuery param ,PageQuery pageQuery) { + Page page = PageHelper + .startPage(pageQuery.getPage()+1, pageQuery.getSize()) + .setOrderBy("workorder_code desc,seq_number asc"); + param.setOrderby("true"); + List list = iPdmProduceWorkorderService.reportQuery(param); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build,HttpStatus.OK); + } } 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 39a97d37..25dee9b7 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 @@ -10,6 +10,7 @@ import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.RedissonUtils; +import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.common.utils.api.ResultCode; import org.nl.modules.common.exception.BizCoreException; @@ -22,8 +23,11 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author qinx @@ -73,6 +77,9 @@ public class ProduceshiftorderController{ if(null == param) { throw new BizCoreException(ResultCode.VALIDATE_FAILED); } + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.put("optuser",SecurityUtils.getCurrentUserId()); + } List list = iPdmProduceWorkorderService.getOrderList(param, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @@ -86,7 +93,10 @@ public class ProduceshiftorderController{ throw new BizCoreException(ResultCode.VALIDATE_FAILED); } /** @see org.nl.common.enums.WorkerOrderEnum */ - param.put("workorder_status","'2','3','4','5'"); + param.put("workorder_status","'2','3','4'"); + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.put("optuser",SecurityUtils.getCurrentUserId()); + } List list = iPdmProduceWorkorderService.getOrderList(param, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @@ -108,6 +118,14 @@ public class ProduceshiftorderController{ public ResponseEntity saveReport(@RequestBody JSONObject param) { return new ResponseEntity<>(iPdmProduceWorkorderService.report(param), HttpStatus.OK); } + @PostMapping("/unqualReport") + @Log("工单不合格报工") + @ApiOperation("工单不合格报工") + public ResponseEntity unqualReport(@RequestBody JSONObject param) { + iPdmProduceWorkorderService.unqualReport(param); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/finish") @Log("看板强制完成") 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 aa52ee08..5c3c1507 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 @@ -60,13 +60,14 @@ public class TaskServiceImpl implements TaskService { } if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) { - map.put("task_code", "%" + whereJson.getString("task_code") + "%"); + if (whereJson.getString("task_code").length()>13){ + map.put("task_id", whereJson.getString("task_code")); + }else { + map.put("task_code", "%" + whereJson.getString("task_code") + "%"); + } } - if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) { - map.put("point_code1", "%" + whereJson.getString("point_code1") + "%"); - } - if (StrUtil.isNotEmpty(whereJson.getString("point_code2"))) { - map.put("point_code2", "%" + whereJson.getString("point_code2") + "%"); + if (StrUtil.isNotEmpty(whereJson.getString("point_code"))) { + map.put("point_code", "%" + whereJson.getString("point_code1") + "%"); } if (StrUtil.isNotEmpty(whereJson.getString("vehicle_code"))) { map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%"); 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 314a3062..ab310938 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 @@ -15,6 +15,7 @@ import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; +import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; @@ -33,6 +34,8 @@ import org.nl.wms.scheduler_manage.service.scheduler.ISchProcessRouteService; import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.FlowElement; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; +import org.nl.wms.system_manage.service.param.ISysParamService; +import org.nl.wms.system_manage.service.param.dao.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,6 +67,8 @@ public class SpeEmpTask extends AbstractAcsTask { private ISchCachelineVehilematerialService vehilematerialService; @Autowired private ISchProcessRouteService schProcessRouteService; + @Autowired + private ISysParamService sysParamService; private final Map SpeHandles= new HashMap<>(); @@ -76,7 +81,9 @@ public class SpeEmpTask extends AbstractAcsTask { public void updateTaskStatus(JSONObject param,String status) { SchBaseTask task = taskService.getOne(new QueryWrapper().eq("task_id", param.getString("task_id"))); try { - SpeHandles.get(task.getTask_name()).handle(param,status,task); + RedissonUtils.lock(()->{ + SpeHandles.get(task.getTask_name()).handle(param,status,task); + },param.getString("task_id")+status,2); }catch (Exception ex){ log.error("更新状态异常updateTaskStatus param:{},status:{},ex:{}",param,status,ex); throw ex; @@ -86,6 +93,10 @@ public class SpeEmpTask extends AbstractAcsTask { @Override @Transactional public String createTask(JSONObject param) { + Param speemp = sysParamService.getOne(new QueryWrapper().eq("code", "speemp")); + if (speemp !=null){ + return "speemp"; + } //{"workorder_code":230523019,"device_code":"A1_TW_15_6_D","type":"1"} String cahceLine = getRouteXmlFlowByWorkprodure(param); if (cahceLine == null) { return null; } @@ -97,7 +108,7 @@ public class SpeEmpTask extends AbstractAcsTask { .eq("point_code2", param.getString("device_code")).lt("task_status", StatusEnum.TASK_FINISH.getCode()) ); if (!CollectionUtils.isEmpty(list)){ - throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code"))); + throw new BadRequestException(String.format("设备%s存在未完成任务:"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } JSONObject form = new JSONObject(MapOf.of("start_point_code",cahceLine, @@ -105,6 +116,7 @@ public class SpeEmpTask extends AbstractAcsTask { "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id())); String taskId = IdUtil.getStringId(); JSONObject task = packageParam(form, taskId); + task.put("table_fk_id",param.getString("workorder_code")); taskService.save(task.toJavaObject(SchBaseTask.class)); return taskId; @@ -194,7 +206,6 @@ public class SpeEmpTask extends AbstractAcsTask { if (!("fall_finish"+task.getTask_id()).equals(device.getRemark())){ iDeviceService.update(new UpdateWrapper() .set("material_id", task.getMaterial_id()) - .set("deviceinstor_qty",device.getDeviceinstor_qty().add(task.getMaterial_qty())) .set("remark","fall_finish"+task.getTask_id()) .eq("device_code", task.getPoint_code2())); } 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 b1169c90..7ef63ec2 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 @@ -14,6 +14,7 @@ import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; +import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; @@ -81,7 +82,9 @@ public class SpeFullTask extends AbstractAcsTask { SchBaseTask task = taskService.getById(param.getString("task_id")); pointService.update(new UpdateWrapper().set("lock_type","0").in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); try { - SpeHandles.get(task.getTask_name()).handle(param,status,task); + RedissonUtils.lock(()->{ + SpeHandles.get(task.getTask_name()).handle(param,status,task); + },param.getString("task_id")+status,2); }catch (Exception ex){ log.error(OPT_NAME+"updateStatus error:{}",ex); throw ex; @@ -102,15 +105,15 @@ public class SpeFullTask extends AbstractAcsTask { .eq("point_code1", point_code).lt("task_status", StatusEnum.TASK_FINISH.getCode()) ); if (!CollectionUtils.isEmpty(list)){ - throw new BadRequestException(String.format("设备%s存在未完成任务", param.getString("device_code"))); + throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } JSONObject empPoint = WQL.getWO("sch_point").addParamMap(MapOf.of("flag", "2", "point_code", point_code, "point_type", StatusEnum.POINT_LOCATION_EMP.getCode())).process().uniqueResult(0); JSONObject form = new JSONObject(MapOf.of("start_point_code",point_code, "next_point_code","","return_point_code", empPoint.getString("point_code"),"vehicle_code", "","product_area",order.getProduct_area(),"quantity", quantity,"type",AcsTaskEnum.TASK_PRODUCT_MAC.getCode(),"material_id", order.getMaterial_id())); - String taskId = IdUtil.getStringId(); JSONObject task = packageParam(form, taskId); + task.put("table_fk_id",param.getString("workorder_code")); taskService.save(task.toJavaObject(SchBaseTask.class)); return taskId; } @@ -216,6 +219,10 @@ public class SpeFullTask extends AbstractAcsTask { taskService.update(wrapper); //outboxt箱子更新到任务表vechile_code2? if (extParam.get("inbox") != null){ + List list = cacheLineVechileService.list(new QueryWrapper().eq("vehicle_code", extParam.get("inbox"))); + if (!CollectionUtils.isEmpty(list)){ + cacheLineVechileService.removeByIds(list.stream().map(SchCachelineVehilematerial::getVehmaterial_id).collect(Collectors.toList())); + } SchCachelineVehilematerial vehilematerial = new SchCachelineVehilematerial(); vehilematerial.setCreate_time(DateUtil.now()); vehilematerial.setVehmaterial_id(IdUtil.getStringId()); @@ -272,6 +279,14 @@ public class SpeFullTask extends AbstractAcsTask { .set("task_status",StatusEnum.TASK_FINISH.getCode()) .set("update_name","acs") .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); + PdmBiDevice one = deviceService.getOne(new QueryWrapper().eq("device_code", task.getPoint_code2())); + if (!("fall_finish"+task.getTask_id()).equals(one.getRemark())){ + 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_CANNEL: cancel(param.getString("task_id")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql index 7eaa46ef..0100f0f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql @@ -14,12 +14,14 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.task_status TYPEAS s_string + 输入.task_status TYPEAS s_string 输入.finished_type TYPEAS s_string 输入.task_type TYPEAS s_string - 输入.point_code1 TYPEAS s_string - 输入.point_code2 TYPEAS s_string + 输入.point_code1 TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.point_code2 TYPEAS s_string 输入.task_code TYPEAS s_string + 输入.task_id TYPEAS s_string 输入.product_area TYPEAS s_string 输入.vehicle_code TYPEAS s_string 输入.begin_time TYPEAS s_string @@ -52,6 +54,9 @@ PAGEQUERY SELECT task.*, + mb.material_name, + mb.material_spec, + mb.material_code, md.class_name task_type_name, DICT.label task_status_name, reg1.region_name as point1_region_name, @@ -61,6 +66,7 @@ FROM sch_base_task task LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code + left join md_me_materialbase mb on mb.material_id = task.material_id LEFT JOIN SYS_DICT DICT ON DICT.`VALUE` = TASK.TASK_STATUS AND DICT.`CODE` = 'TASK_STATUS' LEFT JOIN SCH_BASE_Region reg1 ON reg1.region_code = ( SELECT p1.region_code FROM SCH_BASE_Point p1 WHERE p1.point_code = task.point_code1 @@ -91,6 +97,9 @@ OPTION 输入.product_area <> "" task.product_area = 输入.product_area ENDOPTION + OPTION 输入.point_code <> "" + ( task.point_code1 = 输入.product_area or task.point_code2 = 输入.product_area) + ENDOPTION OPTION 输入.unFinish <> "" task.task_status <> '7' ENDOPTION @@ -103,6 +112,9 @@ OPTION 输入.task_code <> "" (task.task_code like 输入.task_code) ENDOPTION + OPTION 输入.task_id <> "" + (task.task_id = 输入.task_code) + ENDOPTION OPTION 输入.point_code <> "" (task.point_code1 like 输入.point_code1) ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java index 9428e420..28a021ee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/IPdmBiDeviceService.java @@ -25,7 +25,8 @@ public interface IPdmBiDeviceService extends IService { * @param param * @return */ - List workproceduceDevices(Map param); + List workproceduceDevicesQty(Map param); + List workproceduceDevicesWeight(Map param); /** * 根据点位查询对应设备 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java index 9e3e4f69..4744105d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java @@ -98,6 +98,7 @@ public class PdmBiDevice implements Serializable { * 设备实时来料仓数:用于数量校验 */ private BigDecimal deviceinstor_qty; + private BigDecimal deviceinstor_weight; /** * 设备实时产品仓数 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java index 115bc281..d860d200 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.java @@ -19,7 +19,9 @@ public interface PdmBiDeviceMapper extends BaseMapper { List getNotWorkDevice(Map query); - List workproceduceDevices(Map query); + List workproceduceDevicesQty(Map query); + + List workproceduceDevicesWeight(Map query); PdmBiDevice getDeviceByPoint(String pointCode); } 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 dda8af9f..a0f7ff91 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 @@ -18,7 +18,7 @@ from PDM_produce_workOrder o where '5' > o.workorder_status and o.is_delete = '0' ) - select GROUP_CONCAT(sch_base_task.task_id) as tasks,GROUP_CONCAT(sch_base_task.material_id) as materials, pdm_bi_device.inupperlimit_qty - ifnull( sum( sch_base_task.material_qty ), 0 ) - pdm_bi_device.deviceinstor_qty AS currentQty, @@ -33,12 +33,35 @@ and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '') + GROUP BY pdm_bi_device.device_code + HAVING currentQty > #{qty} + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml index 86e6386e..4a92b47c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/xml/PdmProduceWorkorderrecordMapper.xml @@ -19,18 +19,26 @@ and wr.device_code = #{query.device_code} - - and wr.workorder_code = #{query.workorder_code} + + and re.report_status in ( ${query.report_status}) and wr.workorder_id = #{query.workorder_id} - - and wr.realproducestart_date >= #{query.start_time} + + and wr.shift_type_scode = #{query.shift_type_scode} + + + and re.operatetime_start >= #{query.begin_time} - and #{query.end_time} >= wr.realproducestart_date + and #{query.end_time} >= re.operatetime_start + + + and wr.current_produce_person_id = #{query.user_id} + + + order by workorder_code desc,seq_number asc - order by workorder_code desc,seq_number asc diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java index 58993dec..c5c2f1c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java @@ -20,9 +20,12 @@ public class ReportQuery { private String workorder_code; private String workorder_id; private String report; - private String start_time; + private String begin_time; private String end_time; + private String shift_type_scode; + private String user_id; private Boolean is_report =false; private String report_status; + private String orderby; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java index 019065eb..5436212b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java @@ -18,6 +18,7 @@ import java.util.Map; public class WorkorderQuery extends BaseQuery { private String workorder_code; + private String device_code; private String material; private String order_status; private String workprocedure_code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 3b58d7ee..1d488e2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,8 +15,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; import org.jetbrains.annotations.NotNull; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -30,6 +35,7 @@ import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstand import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.mps.service.WorkOrderImportEnum; +import org.nl.wms.mps.service.dto.ProduceWorkorderDto; import org.nl.wms.mps.service.dto.ProduceshiftorderDto; import org.nl.wms.product_manage.ReportEnum; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; @@ -42,6 +48,8 @@ import org.nl.wms.product_manage.service.workorder.dao.WorkorderRecord; import org.nl.wms.product_manage.service.workorder.dao.mapper.PdmProduceWorkorderMapper; import org.nl.wms.product_manage.service.workorder.dto.ReportQuery; import org.nl.wms.product_manage.service.workorder.dto.WorkorderQuery; +import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; import org.nl.wms.system_manage.service.user.ISysUserService; import org.nl.wms.system_manage.service.user.dao.SysUser; import org.redisson.misc.Hash; @@ -55,8 +63,14 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.InputStream; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; +import java.util.function.Predicate; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -83,6 +97,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl result = wmsToAcsService.orderStatusUpdate(array); if (!HttpStatus.OK.equals(result.get("status"))) { @@ -225,289 +242,124 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl> read = excelReader.read(); + // 循环获取的数据 + List data = new ArrayList<>(); + List errlist = new ArrayList<>(); + row: + for (int i = 0; i < read.size(); i++) { + Map errorMap = new HashMap(); + List list = read.get(i); + if (ObjectUtil.isEmpty(list)) {continue;} + PdmProduceWorkorder workorder = new PdmProduceWorkorder(); + packageForm(workorder); + for (int j = 0; j < list.size(); j++) { + String col = String.valueOf(list.get(j)); + 解析cell:{ //如果是第一行 为生产日期 + if (i == 0 && j == 0) { + continue row; + } + //如果第一列包含规格二字 则为表头 结束内循环列 + if (j == 0 && col.contains("班次")) { + continue row; + } + if (j == 0) { + //物料 + workorder.setShift_type_scode(col.equals("晚班") ? "2" : "1"); + } + if (j == 1) { + //物料 + workorder.setPlanproduceend_date(col.substring(0,col.indexOf(" "))+" 18:30:00"); + workorder.setPlanproducestart_date(col.substring(0,col.indexOf(" "))+" 07:30:00"); + } + if (j == 2) { + //物料 + List material_specs = materialbaseService.list(new QueryWrapper().eq("material_spec", col)); + if (CollectionUtils.isEmpty(material_specs)) { + errorMap.put("第" + j + "行", col+"物料规格对应物料信息不存在"); + } else { + Optional first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") + && Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1)) + ).findFirst(); + if (!first.isPresent()) { + errorMap.put("第" + j + "行", col+"物料规格对应物料信息不存在"); + } + workorder.setMaterial_id(first.get().getMaterial_id()); + } + } + if (j == 3) { + PdmBiWorkprocedure workprocedure = workprocedureService.getOne(new QueryWrapper().eq("workprocedure_name", col)); + if (ObjectUtil.isEmpty(workprocedure)) { + errorMap.put("第" + j + "行", col+"工序名称是否正确"); + } else { + workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id()); + } + } + if (j == 4) { + //设备 A1_TW_ + workorder.setDevice_code("A1_TW_" + col.replaceAll("-", "_")); + } + if (j == 7) { + //单重 + BigDecimal bigDecimal = BigDecimal.valueOf(Double.valueOf(col) * 1000); + workorder.setMaterial_weight(bigDecimal.setScale(3, RoundingMode.HALF_UP)); + } + if (j == 8) { + //操作工 + SysUser user = userService.getOne(new QueryWrapper().eq("person_name", col)); + if (ObjectUtil.isEmpty(user)) { + errorMap.put("第" + j + "行", col+" 操作工没有账号"); + } else { + workorder.setCurrent_produce_person_id(user.getUser_id()); + } + } + if (j == 9) { + workorder.setPlan_qty(new BigDecimal(Long.valueOf(col))); + } + if (j == 13) { + workorder.setIs_needmove(col.equals("是")?true:false); + } + } + } + if (CollectionUtils.isEmpty(errorMap)){ + data.add(workorder); + }else { errlist.add(errorMap); }; + } + if (!CollectionUtils.isEmpty(errlist)){ + throw new BadRequestException(JSON.toJSONString(errlist)); + }else { + this.saveBatch(data); + } } catch (Exception e) { e.printStackTrace(); - } - - // 调用用 hutool 方法读取数据 调用第一个sheet白班数据 - ExcelReader excelReader = ExcelUtil.getReader(inputStream, 0); - // 从第1行开始获取数据 excelReader.read的结果是一个2纬的list，外层是行，内层是行对应的所有列 - List> read = excelReader.read(0, excelReader.getRowCount()); - String produce_date = ""; - // 循环获取的数据 - List entitys = new ArrayList<>(); - row: - for (int i = 0; i < read.size(); i++) { - List list = read.get(i); - if (ObjectUtil.isEmpty(list)) { - continue; + throw new BadRequestException(e.getMessage()); + }finally { + if (inputStream !=null){ + try { + inputStream.close(); + }catch (Exception ex){ } } - //获取每列 - JSONObject param = new JSONObject(); - //按照列获取 - param.put("workorder_id", cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId()); - param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); -// param.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId()); - param.put("workorder_status", WorkerOrderEnum.CREATE.getCode()); - param.put("shift_type_scode", StatusEnum.DAYSHIFT.getCode()); // 默认白班 - String is_error = "0"; - String error_message = ""; - //循环每一行 - col: - for (int j = 0; j < list.size(); j++) { - - String col = String.valueOf(list.get(j)); - //如果是第一行 为生产日期 - if (i == 0 && j == 0) { - produce_date = col.split("：")[col.split("：").length - 1]; - continue row; - } - //如果第一列包含规格二字 则为表头 结束内循环列 - if (j == 0 && col.contains("规格名称")) { - continue row; - } - if (j == 0) { - //物料 - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "物料规格为空，"; - } - MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper().eq("material_spec", col)); - if (ObjectUtil.isEmpty(material)) { - is_error = "1"; - error_message = error_message + "物料规格对应物料信息不存在，"; - } else { - param.put("material_id", material.getMaterial_id()); - } - } - if (j == 2) { - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "工序名称为空，"; - } - WorkOrderImportEnum idByName = WorkOrderImportEnum.getIdByName(col); - if (ObjectUtil.isEmpty(idByName)) { - is_error = "1"; - error_message = error_message + "工序名称是否正确，"; - } else { - param.put("workprocedure_id", idByName.getId()); - } - } - if (j == 4) { - //单重 - param.put("material_weight", col); - } - if (j == 6) { - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "工单计划数量为空，"; - } else { - param.put("plan_qty", col); - } - } - if (j == 10) { - String workprocedure_id = param.getString("workprocedure_id"); - PdmBiDevice device = deviceService.getOne(new QueryWrapper().eq("device_code", col)); - if (ObjectUtil.isEmpty(device)) { - is_error = "1"; - error_message = error_message + "设备编码不存在，"; - } - if (!workprocedure_id.equals(device.getWorkprocedure_id())) { - is_error = "1"; - error_message = error_message + "设备与所属工序不匹配，"; - } else { - param.put("device_code", device.getDevice_code()); - } - } - if (j == 11) { - SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", col)); - if (ObjectUtil.isEmpty(jsonUser)) { - is_error = "1"; - error_message = error_message + "生产人员编码不存在！"; - } else { - param.put("current_produce_person_id", jsonUser.getUser_id()); - } - } - if (j == 12) { - //允许修改报工数量 - String is_canupdate = "0"; - if (col.equals("是")) { - is_canupdate = "1"; - } - param.put("is_canupdate_update", is_canupdate); - } - if (j == 13) { - //是否agv搬运 - String needmoce = "0"; - if (col.equals("是")) { - needmoce = "1"; - } - param.put("is_needmove", needmoce); - } - } - param.put("is_error", is_error); - param.put("error_info", error_message); - param.put("create_type", StatusEnum.EXCELINTO.getCode()); - param.put("planproducestart_date", produce_date + "07:30:00"); - param.put("planproduceend_date", produce_date + "18:30:00"); - param.put("create_id", currentUserId); - param.put("create_name", nickName); - param.put("create_time", DateUtil.now()); - entitys.add(param.toJavaObject(PdmProduceWorkorder.class)); } - // 1.获取上传文件输入流 - inputStream = null; - try { - inputStream = file.getInputStream(); - } catch (Exception e) { - e.printStackTrace(); - } - //读取夜班工单数据 - excelReader = ExcelUtil.getReader(inputStream, 1); - read = excelReader.read(0, excelReader.getRowCount()); - String is_error = "0"; - String error_message = ""; - // 循环获取的数据 - row: - for (int i = 0; i < read.size(); i++) { - List list = read.get(i); - //获取每列 - JSONObject param = new JSONObject(); - //按照列获取 - param.put("workorder_id", cn.hutool.core.util.IdUtil.getSnowflake(1, 1).nextId()); - param.put("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); -// param.put("producedeviceorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")); - param.put("workorder_status", WorkerOrderEnum.CREATE.getCode()); -// param.put("produce_date", produce_date); - param.put("shift_type_scode", StatusEnum.NIGHTSHIFT.getCode()); // 夜班 - //循环每一行 - col: - for (int j = 0; j < list.size(); j++) { + } - String col = String.valueOf(list.get(j)); - //如果是第一行 为生产日期 - if (i == 0 && j == 0) { - produce_date = col.split("：")[col.split("：").length - 1]; - continue row; - } - //如果第一列包含规格二字 则为表头 结束内循环列 - if (j == 0 && col.contains("规格名称")) { - continue row; - } - if (j == 0) { - //物料 - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "物料规格为空，"; - } - MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper().eq("material_spec", col)); - if (ObjectUtil.isEmpty(material)) { - is_error = "1"; - error_message = error_message + "物料规格对应物料信息不存在，"; - } else { - param.put("material_id", material.getMaterial_id()); - } - } - if (j == 2) { - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "工序名称为空，"; - } - WorkOrderImportEnum idByName = WorkOrderImportEnum.getIdByName(col); - if (ObjectUtil.isEmpty(idByName)) { - is_error = "1"; - error_message = error_message + "工序名称是否正确，"; - } else { - param.put("workprocedure_id", idByName.getId()); - } - } - if (j == 4) { - //单重 - param.put("material_weight", col); - } - if (j == 6) { - if (StrUtil.isEmpty(col)) { - is_error = "1"; - error_message = error_message + "工单计划数量为空，"; - } else { - param.put("plan_qty", col); - } - } -// if (j == 10) { -// //物料 -// JSONObject json_material = wo_material.query("is_delete = '0' and material_code = '" + col + "'").uniqueResult(0); -// if (ObjectUtil.isEmpty(json_material)) { -// throw new BadRequestException("第'" + (i + 2) + "'行,物料编码不存在"); -// } -// param.put("material_id", json_material.getString("material_id")); -// } - if (j == 10) { - String workprocedure_id = param.getString("workprocedure_id"); - PdmBiDevice device = deviceService.getOne(new QueryWrapper().eq("device_code", col)); - if (ObjectUtil.isEmpty(device)) { - is_error = "1"; - error_message = error_message + "设备编码不存在，"; - } - if (!workprocedure_id.equals(device.getWorkprocedure_id())) { - is_error = "1"; - error_message = error_message + "设备与所属工序不匹配，"; - } else { - param.put("device_code", device.getDevice_code()); - } - } - if (j == 11) { - SysUser jsonUser = userService.getOne(new QueryWrapper().eq("username", col)); - if (ObjectUtil.isEmpty(jsonUser)) { - is_error = "1"; - error_message = error_message + "生产人员编码不存在！"; - } else { - param.put("current_produce_person_id", jsonUser.getUser_id()); - } - } - if (j == 12) { - //允许修改报工数量 - String is_canupdate = "0"; - if (col.equals("是")) { - is_canupdate = "1"; - } - param.put("is_canupdate_update", is_canupdate); - } - if (j == 13) { - //是否agv搬运 - String needmoce = "0"; - if (col.equals("是")) { - needmoce = "1"; - } - param.put("is_needmove", needmoce); - } - } - param.put("is_error", is_error); - param.put("error_info", error_message); - param.put("create_type", StatusEnum.EXCELINTO.getCode()); - param.put("planproducestart_date", produce_date + "18:30:00"); - DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(produce_date), 1); - param.put("planproduceend_date", DateUtil.format(dateTime, "yyyy-MM-dd") + " 07:30:00"); - param.put("create_id", currentUserId); - param.put("create_name", nickName); - param.put("create_time", DateUtil.now()); - entitys.add(param.toJavaObject(PdmProduceWorkorder.class)); - } - if (!CollectionUtils.isEmpty(entitys)) { - this.saveBatch(entitys); - } + private void packageForm(PdmProduceWorkorder workorder) { + workorder.setWorkorder_id(IdUtil.getStringId()); + workorder.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER")); + workorder.setWorkorder_status(WorkerOrderEnum.CREATE.getCode()); + workorder.setIs_needmove(true); + workorder.setIs_canupdate_update(true); + workorder.setCreate_time(DateUtil.now()); + workorder.setCreate_id(SecurityUtils.getCurrentUserId()); + workorder.setCreate_name("导入订单"); + workorder.setCreate_type(StatusEnum.EXCELINTO.getCode()); } @@ -588,35 +440,46 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl().eq("workorder_id", param.getString("workorder_id"))); // if (workorder.getWorkorder_status().equals(WorkerOrderEnum.COMPLETE.getCode()) || workorder.getWorkorder_status().equals(WorkerOrderEnum.FORCE_COMPLETE.getCode())) { // throw new BadRequestException(param.getString("workorder_id") + "当前工单已经完工不允许报工"); // } + Assert.notNull(workorder,"当前工单不存在"); PdmProduceWorkorderrecord one = reportRecordService.getOne(new QueryWrapper() .eq("workorder_id", param.getString("workorder_id")).eq("report_status", ReportEnum.REPORT_STATUS.code("生成"))); - if (one == null) { - throw new BadRequestException(param.getString("workorder_id") + "当前工单没有生成状态的报工记录"); - } + Assert.notNull(one,param.getString("workorder_id") + "当前工单没有生成状态的报工记录"); workorder.setReport_qty(workorder.getReport_qty().add(param.getBigDecimal("report_qty"))); - workorder.setNok_qty(workorder.getReport_qty().add(param.getBigDecimal("nok_qty"))); - workorder.setRepare_qty(workorder.getReport_qty().add(param.getBigDecimal("repare_qty"))); if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) { workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode()); + JSONArray array = new JSONArray(); + JSONObject map = new JSONObject(); + map.put("workorder_id", workorder.getWorkorder_id()); + map.put("type", WorkerOrderEnum.COMPLETE.getCode()); + array.add(map); + wmsToAcsService.orderStatusUpdate(array); } workorder.setReal_qty(null); this.updateById(workorder); reportRecordService.update(new UpdateWrapper() .set("report_qty", param.getBigDecimal("report_qty")) - .set("nok_qty", param.getBigDecimal("nok_qty")) - .set("repare_qty", param.getBigDecimal("repare_qty")) .set("report_status", ReportEnum.REPORT_STATUS.code("报工")) .set("needproduct_qty", Math.max(0,workorder.getPlan_qty().intValue() - workorder.getReport_qty().intValue())) .eq("macoperate_id", one.getMacoperate_id())); return one.getMacoperate_id(); } + @Override + public void unqualReport(JSONObject param) { + Assert.notNull(new Object[]{param, param.get("report_qty"),param.getString("workorder_id")}, "请求参数不能为空"); + PdmProduceWorkorder workorder = this.getOne(new QueryWrapper().eq("workorder_id", param.getString("workorder_id"))); + Assert.notNull(workorder,"当前工单不存在"); + workorder.setRepare_qty(param.getBigDecimal("nok_qty")); + workorder.setRepare_qty(param.getBigDecimal("repare_qty")); + workorder.setReal_qty(null); + this.updateById(workorder); + } @Override @Transactional @@ -647,23 +510,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl packageWorkorderQty(List record, List itemRecord) { List ids = itemRecord.stream().map(PdmProduceWorkorderrecord::getMacoperate_id).collect(Collectors.toList()); List oldRecord = record.stream().filter(item -> ids.contains(item.getMacoperate_id())).collect(Collectors.toList()); - long old_nok_qty = oldRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum(); - long new_nok_qty = itemRecord.stream().mapToLong(a->a.getNok_qty().longValue()).sum(); - long old_repare_qty = oldRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum(); - long new_repare_qty = itemRecord.stream().mapToLong(a->a.getRepare_qty().longValue()).sum(); long old_report_qty = oldRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum(); long new_report_qty = itemRecord.stream().mapToLong(a->a.getReport_qty().longValue()).sum(); - List list = new ArrayList<>(); - Map nok_qty = new HashMap<>(); - nok_qty.put("field", "nok_qty"); - nok_qty.put("value", Math.abs(new_nok_qty - old_nok_qty)); - nok_qty.put("add", new_nok_qty > old_nok_qty); - list.add(nok_qty); - Map repare_qty = new HashMap<>(); - repare_qty.put("field", "repare_qty"); - repare_qty.put("value", Math.abs(new_repare_qty - old_repare_qty)); - repare_qty.put("add", new_repare_qty > old_repare_qty); - list.add(repare_qty); + List list = new ArrayList<>(); Map report_qty = new HashMap<>(); report_qty.put("field", "report_qty"); report_qty.put("value", Math.abs(new_report_qty - old_report_qty)); @@ -738,10 +587,15 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl() - .set("nok_qty",param.getBigDecimal("nok_qty")) - .set("repare_qty",param.getBigDecimal("repare_qty")) - .set("report_qty",param.getBigDecimal("report_qty")) + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + if (param.getBigDecimal("nok_qty")!=null){ + updateWrapper.set("nok_qty",param.getBigDecimal("nok_qty")); + } + if (param.getBigDecimal("repare_qty")!=null){ + updateWrapper.set("repare_qty",param.getBigDecimal("repare_qty")); + } + updateWrapper.set("report_qty",param.getBigDecimal("report_qty")); + reportRecordService.update(updateWrapper .eq("macoperate_id", param.getString("macoperate_id"))); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java index 0450d061..a0aa8f51 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java @@ -3,12 +3,19 @@ package org.nl.wms.scheduler_manage.controller.task; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.enums.StatusEnum; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; +import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.system_manage.service.dict.ISysDictService; import org.nl.wms.system_manage.service.dict.dao.Dict; import org.nl.wms.product_manage.sch.manage.FinishTypeEnum; @@ -21,6 +28,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** * @author ldjun @@ -42,8 +50,22 @@ public class TaskController { @Log("查询任务") @ApiOperation("查询任务") //@PreAuthorize("@el.check('task:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity query(@RequestParam Map query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); + page.setOrderBy("task_code desc"); + List list = baseTaskService.queryAll(query); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build, HttpStatus.OK); + } + + + @GetMapping("/undo") + @Log("查询任务") + @ApiOperation("查询任务") + public ResponseEntity undo() { + int count = baseTaskService.count(new QueryWrapper().lt("task_status", StatusEnum.TASK_FINISH.getCode())); + return new ResponseEntity<>(count, HttpStatus.OK); } @PostMapping diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java index df6f158b..7ac39cac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/ISchBaseTaskService.java @@ -3,6 +3,7 @@ package org.nl.wms.scheduler_manage.service.task; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; import java.util.Map; /** @@ -21,4 +22,6 @@ public interface ISchBaseTaskService extends IService { * @param param */ void operation(Map param); + + List queryAll(Map query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java index b7630924..268641d6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/SchBaseTaskMapper.java @@ -17,5 +17,7 @@ import java.util.Map; */ public interface SchBaseTaskMapper extends BaseMapper { - List getTaskInfo (@Param("map") Map map); + List getTaskInfo (Map map); + + List queryAll (Map map); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml index 68475c66..f8933dd0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dao/mapper/xml/SchBaseTaskMapper.xml @@ -21,7 +21,6 @@ LEFT JOIN sch_base_point point1 ON task.point_code1 = point1.point_code LEFT JOIN sch_base_point point2 ON task.point_code2 = point2.point_code LEFT JOIN md_me_materialbase mater ON task.material_id = mater.material_id - LEFT JOIN md_pb_classstandard class ON task.task_type = class.class_id LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status' task.is_delete = '0' @@ -31,4 +30,64 @@ + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java new file mode 100644 index 00000000..8530eb67 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/dto/TaskQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.scheduler_manage.service.task.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; + +/* + * @author ZZQ + * @Date 2023/6/9 15:49 + */ +public class TaskQuery extends BaseQuery { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java index 0147ca52..a8cfd726 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java @@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; +import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.scheduler_manage.service.task.dao.mapper.SchBaseTaskMapper; @@ -22,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -39,19 +44,41 @@ public class SchBaseTaskServiceImpl extends ServiceImpl queryAll(Map query) { + if (query.get("task_status") != null && ((String)query.get("task_status")).contains("-1")){ + query.put("task_status",((String)query.get("task_status")).replaceAll("-1","1,4,5")); + } + List maps = this.baseMapper.queryAll(query); + return maps; + } + @Override public void operation(Map map) { WmsToAcsServiceImpl wms = new WmsToAcsServiceImpl(); String task_id = MapUtil.getStr(map, "task_id"); String method_name = MapUtil.getStr(map, "method_name"); - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - if (taskObj.getString("task_status").equals(TaskStatusEnum.FINISHED.getCode())) throw new BadRequestException("任务已完成!"); - + SchBaseTask taskObj = this.getOne(new QueryWrapper().eq("task_id", task_id)); + if (taskObj.getTask_status().equals(TaskStatusEnum.FINISHED.getCode())) { + throw new BadRequestException("任务已完成!不允许下发"); + } switch (method_name) { // forceFinish, cancel case "immediateNotifyAcs": - JSONArray array = new JSONArray(); - array.add(taskObj); - wms.issueTaskToAcs(array); + if (!taskObj.getTask_status().equals(TaskStatusEnum.START_AND_POINT.getCode())){ + try { + AbstractAcsTask taskHandler = (AbstractAcsTask) SpringContextHolder.getBean(Class.forName(taskObj.getHandle_class())); + taskHandler.pointConfirm((JSONObject) JSONObject.toJSON(taskObj)); + SchBaseTask task = this.getOne(new QueryWrapper().eq("task_id", task_id)); + JSONArray array = new JSONArray(); + array.add(JSON.toJSON(task)); + wms.issueTaskToAcs(array); + }catch (Exception ex){ + taskObj.setTask_status(StatusEnum.TASK_START_ERROR.getCode()); + taskObj.setRemark(ex.getMessage()); + taskObj.setUpdate_time(new Date()); + this.updateById(taskObj); + } + } break; case "forceFinish": JSONArray finish = new JSONArray(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java index 4cec9f98..4dfa0b09 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java @@ -130,4 +130,28 @@ public class IStivtlostorivnCpInController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/delTask") + @Log("删除任务") + @ApiOperation("删除任务") + public ResponseEntity delTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpService.delTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/sendTask") + @Log("下发任务") + @ApiOperation("下发任务") + public ResponseEntity sendTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpService.sendTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/confirmTask") + @Log("标识完成任务") + @ApiOperation("标识完成任务") + public ResponseEntity confirmTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpService.confirmTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java index 13f6779b..ca102274 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java @@ -117,5 +117,29 @@ public class IStivtlostorivnCpOutController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/delTask") + @Log("删除任务") + @ApiOperation("删除任务") + public ResponseEntity delTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpOutService.delTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/sendTask") + @Log("下发任务") + @ApiOperation("下发任务") + public ResponseEntity sendTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpOutService.sendTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/confirmTask") + @Log("标识完成任务") + @ApiOperation("标识完成任务") + public ResponseEntity confirmTask(@RequestBody JSONObject whereJson){ + iStIvtIostorinvCpOutService.confirmTask(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java index 1ca07fcf..90e71582 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java @@ -2,15 +2,20 @@ package org.nl.wms.storage_manage.productmanage.controller.structIvt; import io.swagger.annotations.ApiOperation; import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** *

* 仓位库存表 前端控制器 @@ -26,6 +31,14 @@ public class StIvtStructivtCpController { @Autowired private IStIvtStructivtCpService iStIvtStructivtCpService; + + @GetMapping + @Log("成品库存查询") + @ApiOperation("成品库存查询") + public ResponseEntity query(CpIvtQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtStructivtCpService.packageQuery(query,page), HttpStatus.OK); + } + @PostMapping("/getStructIvt") @Log("查询库存") @ApiOperation("查询库存") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java index 7af2d9d3..930ba2cc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java @@ -151,4 +151,31 @@ public interface IStIvtIostorinvCpOutService extends IService * } */ void taskOperate(JSONObject whereJson); + + /** + * 删除任务 + * @param whereJson + * { + * iostorinvdis_id ： 分配明细标识 + * } + */ + void delTask(JSONObject whereJson); + + /** + * 下发任务 + * @param whereJson + * { + * task_id ： 任务标识 + * } + */ + void sendTask(JSONObject whereJson); + + /** + * 标识完成任务 + * @param whereJson + * { + * task_id ： 任务标识 + * } + */ + void confirmTask(JSONObject whereJson); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java index 49883fed..f9389824 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java @@ -163,4 +163,30 @@ public interface IStIvtIostorinvCpService extends IService { */ void taskOperate(JSONObject whereJson); + /** + * 删除任务 + * @param whereJson + * { + * iostorinvdis_id ： 分配明细标识 + * } + */ + void delTask(JSONObject whereJson); + + /** + * 下发任务 + * @param whereJson + * { + * task_id ： 任务标识 + * } + */ + void sendTask(JSONObject whereJson); + + /** + * 标识完成任务 + * @param whereJson + * { + * task_id ： 任务标识 + * } + */ + void confirmTask(JSONObject whereJson); } 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 940beca1..961e8cf8 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 @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,6 +22,8 @@ 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.modules.wql.util.SpringContextHolder; +import org.nl.wms.ext.acs.service.WmsToAcsService; 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; @@ -584,6 +588,52 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl().lambda() + .set(SchBaseTask::getTask_status,TaskStatusEnum.CANCEL.getCode()) + .eq(SchBaseTask::getTask_id, disDao.getTask_id()) + ); + + // 2.更新分配 + disDao.setTask_id(""); + disDao.setPoint_code(""); + disDao.setPoint_id(""); + disDao.setPoint_name(""); + disDao.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); + iostorinvdisCpService.updateById(disDao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void sendTask(JSONObject whereJson) { + + SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id")); + JSONArray paramArr = new JSONArray(); + paramArr.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao))); + + // 1.下发任务 + WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class); + bean.issueTaskToAcs2(paramArr); + + // 2.更新任务状态 + taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); + iSchBaseTaskService.updateById(taskDao); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirmTask(JSONObject whereJson) { + whereJson.put("status", AcsTaskEnum.STATUS_FINISH.getCode()); + taskOperate(whereJson); + } + @NotNull private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) { JSONArray rows = whereJson.getJSONArray("tableData"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index 22b201c8..4ca30240 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -17,10 +19,13 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.publish.event.PointEvent; +import org.nl.common.utils.AcsUtil; 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.modules.wql.util.SpringContextHolder; +import org.nl.wms.ext.acs.service.WmsToAcsService; 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; @@ -707,6 +712,51 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl().lambda() + .set(SchBaseTask::getTask_status,TaskStatusEnum.CANCEL.getCode()) + .eq(SchBaseTask::getTask_id, disDao.getTask_id()) + ); + + // 2.更新分配 + disDao.setTask_id(""); + disDao.setPoint_code(""); + disDao.setPoint_id(""); + disDao.setPoint_name(""); + disDao.setWork_status(IOSEnum.WORK_STATUS.code("未生成")); + iostorinvdisCpService.updateById(disDao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void sendTask(JSONObject whereJson) { + SchBaseTask taskDao = iSchBaseTaskService.getById(whereJson.getString("task_id")); + JSONArray paramArr = new JSONArray(); + paramArr.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao))); + + // 1.下发任务 + WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class); + bean.issueTaskToAcs2(paramArr); + + // 2.更新任务状态 + taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); + iSchBaseTaskService.updateById(taskDao); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirmTask(JSONObject whereJson) { + whereJson.put("status", AcsTaskEnum.STATUS_FINISH.getCode()); + taskOperate(whereJson); + } + @NotNull private StIvtIostorinvCp packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) { JSONArray rows = whereJson.getJSONArray("tableData"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java index b89401dd..7a4c8f04 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java @@ -2,7 +2,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; import java.util.List; @@ -18,6 +20,13 @@ import java.util.Map; */ public interface IStIvtStructivtCpService extends IService { + + /** + * 成品库存查询 + * @param query / + */ + Object packageQuery(CpIvtQuery query, PageQuery page); + /** * 成品库存更新 * @param json @@ -58,4 +67,5 @@ public interface IStIvtStructivtCpService extends IService { * } */ List getStructIvtMore(StructIvtYLQuery whereJson); + } 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 8f4dc19a..cd3c9df1 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 @@ -3,7 +3,9 @@ package org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; import java.util.List; @@ -27,4 +29,5 @@ public interface StIvtStructivtCpMapper extends BaseMapper { List getStructIvtMoreBox(JSONObject json); + List packageQuery(@Param("query") CpIvtQuery query); } 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 4c9bf7f5..e44d6174 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 @@ -138,4 +138,44 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java new file mode 100644 index 00000000..e02b21b9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dto/CpIvtQuery.java @@ -0,0 +1,27 @@ +package org.nl.wms.storage_manage.productmanage.service.structIvt.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; + +/* + * @author LXY + * @Date 2023/5/4 19:49 + */ +@Data +public class CpIvtQuery extends BaseQuery { + + + private String struct_code; + + private String material_code; + + @Override + public void paramMapping() { + super.doP.put("struct_code", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); + } + + +} 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 78a2a1ba..3da06584 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 @@ -6,6 +6,10 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.modules.common.exception.BadRequestException; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; @@ -17,11 +21,13 @@ import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.StIvtStructivtCp; import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper; +import org.nl.wms.storage_manage.productmanage.service.structIvt.dto.CpIvtQuery; import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.rawmanage.service.structIvt.dto.StructIvtYLQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; import java.math.BigDecimal; import java.util.ArrayList; @@ -48,6 +54,15 @@ public class StIvtStructivtCpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + TableDataInfo build = TableDataInfo.build(this.baseMapper.packageQuery(query)); + build.setTotalElements(page.getTotal()); + + return build; + } + @Override @Transactional(rollbackFor = Exception.class) public void UpdateIvt(JSONObject json) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java index 507cde2d..c214dfd4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java @@ -43,6 +43,7 @@ public class SysMenuController { @GetMapping(value = "/build") @ApiOperation("根据用户获取菜单") + @Log("caidan") public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 4a195bc6..a1268ad0 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -10,20 +10,21 @@ spring: reactive: #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 # endpoints: 47.96.133.178:8200 #外网 - endpoints: http://192.168.46.225:9200 #外网 + endpoints: http://127.0.0.1:9200 #外网 elasticsearch: rest: #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 # uris: 47.96.133.178:8200 #外网 - uris: http://192.168.46.225:9200 #外网 - # username: elastic - # password: 123456 + uris: http://127.0.0.1:9200 #外网 +# username: elastic +# password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false +# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} # password: ${DB_PWD:123456} password: ${DB_PWD:942464Yy} diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index 3889c63b..1d07470d 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8099 + port: 8011 #配置数据源 spring: data: @@ -8,30 +8,32 @@ spring: enabled: true client: reactive: - #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # endpoints: 192.168.46.2255:8200 #外网 - endpoints: http://192.168.46.2255:9200 #外网 + #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # endpoints: 47.96.133.178:8200 #外网 + endpoints: http://192.168.46.225:9200 #外网 elasticsearch: rest: - #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网 - # uris: 192.168.46.2255:8200 #外网 - uris: http://192.168.46.2255:8200 #外网 - username: elastic - password: 123456 + #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网 + # uris: 47.96.133.178:8200 #外网 + uris: http://192.168.46.225:9200 #外网 + # username: elastic + # password: 123456 datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} + # password: ${DB_PWD:123456} password: ${DB_PWD:123456} - #password: ${DB_PWD:Root.123456} + # 初始连接数 - initial-size: 15 + initial-size: 5 # 最小连接数 - min-idle: 45 + min-idle: 15 # 最大连接数 - max-active: 90 + max-active: 30 # 是否自动回收超时连接 remove-abandoned: true # 超时时间(以秒数为单位) @@ -61,11 +63,12 @@ spring: reset-enable: false filters: DruidFilter,stat + redis: #数据库索引 - database: ${REDIS_DB:6} - host: ${REDIS_HOST:127.0.0.1} - #host: ${REDIS_HOST:localhost} + database: ${REDIS_DB:1} + #host: ${REDIS_HOST:127.0.0.1} + host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} #连接超时时间 @@ -169,29 +172,31 @@ sa-token: cookie: # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com domain: + is-read-cookie: false -jetcache: - defaultCacheType: LOCAL - statIntervalMinutes: 15 - areaInCacheName: false - hiddenPackages: com.yb - local: - default: - type: caffeine - limit: 100 - keyConvertor: fastjson - expireAfterWriteInMillis: 60000 - remote: - default: - type: redis.lettuce - keyConvertor: fastjson - valueEncoder: kryo - valueDecoder: kryo - poolConfig: - minIdle: 5 - maxIdle: 200 - maxTotal: 1000 - uri: - - redis://127.0.0.1:6379 +#jetcache: +# defaultCacheType: LOCAL +# statIntervalMinutes: 15 +# areaInCacheName: false +# hiddenPackages: com.yb +# local: +# default: +# type: caffeine +# limit: 100 +# keyConvertor: fastjson +# expireAfterWriteInMillis: 60000 +# remote: +# default: +# type: redis.lettuce +# keyConvertor: fastjson +# valueEncoder: kryo +# valueDecoder: kryo +# poolConfig: +# minIdle: 5 +# maxIdle: 200 +# maxTotal: 1000 +# uri: +# - redis://127.0.0.1:6379 es: index: mes_log +schedulerFile: C:\mes\scheduler.xml diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 29361ef8..cdab71b2 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev3 + active: prod jackson: time-zone: GMT+8 data: diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index 4be68a29..c26c828a 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -172,6 +172,33 @@ https://juejin.cn/post/6844903775631572999 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185,7 +212,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/mes/qd/src/api/wms/st/out/semiProductOut.js b/mes/qd/src/api/wms/st/out/semiProductOut.js index 8d4c1e1c..caeea7c9 100644 --- a/mes/qd/src/api/wms/st/out/semiProductOut.js +++ b/mes/qd/src/api/wms/st/out/semiProductOut.js @@ -1,228 +1,261 @@ import request from '@/utils/request' export function add(data) { - return request({ - url: 'api/productOut', - method: 'post', - data - }) + return request({ + url: 'api/semiProductOut', + method: 'post', + data + }) } export function del(ids) { - return request({ - url: 'api/productOut/', - method: 'delete', - data: ids - }) + return request({ + url: 'api/semiProductOut/', + method: 'delete', + data: ids + }) } export function edit(data) { - return request({ - url: 'api/productOut', - method: 'put', - data - }) + return request({ + url: 'api/semiProductOut', + method: 'put', + data + }) } export function getOutBillDtl(data) { - return request({ - url: '/api/productOut/getOutBillDtl', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/getOutBillDtl', + method: 'post', + data + }) } export function getOutBillDis(data) { - return request({ - url: '/api/productOut/getOutBillDis', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/getOutBillDis', + method: 'post', + data + }) } export function getOutBillDisDtl(params) { - return request({ - url: '/api/productOut/getOutBillDisDtl', - method: 'get', - params - }) + return request({ + url: '/api/semiProductOut/getOutBillDisDtl', + method: 'get', + params + }) } export function getOutBillTask(params) { - return request({ - url: '/api/productOut/getOutBillTask', - method: 'get', - params - }) + return request({ + url: '/api/semiProductOut/getOutBillTask', + method: 'get', + params + }) } export function getInvTypes() { - return request({ - url: '/api/productOut/getInvTypes', - method: 'get' - }) + return request({ + url: '/api/semiProductOut/getInvTypes', + method: 'get' + }) } export function insertDtl(data) { - return request({ - url: '/api/productOut/insertDtl', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/insertDtl', + method: 'post', + data + }) } export function allDiv(data) { - return request({ - url: '/api/productOut/allDiv', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/allDiv', + method: 'post', + data + }) } export function allDivOne(data) { - return request({ - url: '/api/productOut/allDivOne', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/allDivOne', + method: 'post', + data + }) } export function allCancel(data) { - return request({ - url: '/api/productOut/allCancel', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/allCancel', + method: 'post', + data + }) } export function oneCancel(data) { - return request({ - url: '/api/productOut/oneCancel', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/oneCancel', + method: 'post', + data + }) } export function setPoint(data) { - return request({ - url: '/api/productOut/setPoint', - method: 'post', - data - }) + + return request({ + url: '/api/semiProductOut/setPoint', + method: 'post', + data + }) } export function oneSetPoint(data) { - return request({ - url: '/api/productOut/oneSetPoint', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/oneSetPoint', + method: 'post', + data + }) } export function getStructIvt(params) { - return request({ - url: '/api/productOut/getStructIvt', - method: 'get', - params - }) + return request({ + url: '/api/semiProductOut/getStructIvt', + method: 'get', + params + }) } export function manualDiv(data) { - return request({ - url: '/api/productOut/manualDiv', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/manualDiv', + method: 'post', + data + }) } export function confirm(data) { - return request({ - url: '/api/productOut/confirm', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/confirm', + method: 'post', + data + }) } export function issueTask(data) { - return request({ - url: '/api/productOut/issueTask', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/issueTask', + method: 'post', + data + }) } export function finishTask(data) { - return request({ - url: '/api/productOut/finishTask', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/finishTask', + method: 'post', + data + }) } export function cancleTaskfinish(data) { - return request({ - url: '/api/productOut/cancleTaskfinish', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/cancleTaskfinish', + method: 'post', + data + }) } export function paramByCodeType(data) { - return request({ - url: '/api/productOut/paramByCodeType', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/paramByCodeType', + method: 'post', + data + }) } export function schAreaType(data) { - return request({ - url: '/api/productOut/schAreaType', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/schAreaType', + method: 'post', + data + }) } export function backConfirm(data) { - return request({ - url: '/api/productOut/backConfirm', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/backConfirm', + method: 'post', + data + }) } export function getType() { - return request({ - url: '/api/productOut/getType', - method: 'get' - }) + return request({ + url: '/api/semiProductOut/getType', + method: 'get' + }) } export function moneySubmit(data) { - return request({ - url: '/api/productOut/moneySubmit', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/moneySubmit', + method: 'post', + data + }) } export function getDisNum(data) { - return request({ - url: '/api/productOut/getDisNum', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/getDisNum', + method: 'post', + data + }) } export function queryBox(data) { - return request({ - url: '/api/productOut/queryBox', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/queryBox', + method: 'post', + data + }) } export function getOutBillTask2(data) { - return request({ - url: '/api/productOut/getOutBillTask2', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/getOutBillTask2', + method: 'post', + data + }) } export function cancelTask(data) { - return request({ - url: '/api/productOut/cancelTask', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/cancelTask', + method: 'post', + data + }) } export function allSetPoint(data) { - return request({ - url: '/api/productOut/allSetPoint', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/allSetPoint', + method: 'post', + data + }) } export function oneSetPoint2(data) { - return request({ - url: '/api/productOut/oneSetPoint2', - method: 'post', - data - }) + return request({ + url: '/api/semiProductOut/oneSetPoint2', + method: 'post', + data + }) +} +export default { + add, + edit, + del, + allDiv, + allCancel, + getOutBillDtl, + getOutBillDis, + setPoint, + oneSetPoint, + getOutBillTask, + getStructIvt, + manualDiv, + confirm, + issueTask, + finishTask, + cancleTaskfinish, + getInvTypes, + paramByCodeType, + schAreaType, + backConfirm, + getOutBillDisDtl, + getType, + allDivOne, + moneySubmit, + getDisNum, + queryBox, + getOutBillTask2, + oneCancel, + cancelTask, + allSetPoint, + oneSetPoint2 } -export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 } diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue index 87617126..b6b2094d 100644 --- a/mes/qd/src/views/system/user/index.vue +++ b/mes/qd/src/views/system/user/index.vue @@ -644,7 +644,7 @@ export default { // 默认选中 const deptIds = [] for (var index in row.depts) { - deptIds.push(row.depts[index].dept_ud) + deptIds.push(row.depts[index].dept_id) } this.$nextTick(() => { this.$refs.deptUser.setCheckedKeys(deptIds) diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js b/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js new file mode 100644 index 00000000..18bf01ee --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/deviceMaterial.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +export function query(data) { + return request({ + url: 'api/specialDevice/query', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/specialDevice/update', + method: 'post', + data + }) +} + +export default { query, edit } diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue new file mode 100644 index 00000000..3f2205cc --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue new file mode 100644 index 00000000..8d8609d3 --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/备份.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue b/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue new file mode 100644 index 00000000..f31200cf --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/userDeviceReplate/index.vue @@ -0,0 +1,293 @@ + + + + + + + diff --git a/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js b/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js new file mode 100644 index 00000000..6932c75d --- /dev/null +++ b/mes/qd/src/views/wms/device_manage/userDeviceReplate/role.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +// 获取所有的Role +export function getAll() { + return request({ + url: 'api/sysRole/all', + method: 'get' + }) +} + +export function add(data) { + return request({ + url: 'api/sysRole', + method: 'post', + data + }) +} + +export function get(id) { + return request({ + url: 'api/sysRole/' + id, + method: 'get' + }) +} + +export function getLevel() { + return request({ + url: 'api/sysRole/level', + method: 'get' + }) +} + +export function del(ids) { + return request({ + url: 'api/sysRole', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/sysRole', + method: 'put', + data + }) +} + +export function editMenu(data) { + return request({ + url: 'api/sysRole/menu', + method: 'put', + data + }) +} + +export default { add, edit, del, get, editMenu, getLevel } diff --git a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue index da5672f9..d7526503 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue @@ -38,7 +38,7 @@ + + diff --git a/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue b/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue index a964cb3a..52a3b1b6 100644 --- a/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/scheduler/index.vue @@ -52,7 +52,7 @@ @current-change="handleCurrentChange" > - + - + + 未完成数： + 任务调度 + + - + - + + - - - + + + @@ -232,7 +241,6 @@ import pagination from '@crud/Pagination' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudClassstandard from '@/api/wms/basedata/master/classstandard' -import { scheduler } from './task' export default { name: 'Task', @@ -273,6 +281,7 @@ export default { fullscreen: false, currentComponent: '', openParam: {}, + undo: 0, create_time: [], task_status: ['-1'], taskStatusList: [], @@ -297,6 +306,9 @@ export default { crudTask.getTaskType().then(res => { this.taskTypeList = res }) + crudTask.undo().then(res => { + this.undo = res + }) crudTask.getAcsTaskType().then(res => { this.acsTaskTypeList = res }) diff --git a/mes/qd/src/views/wms/scheduler_manage/task/task.js b/mes/qd/src/views/wms/scheduler_manage/task/task.js index 4b534246..b6623abd 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/task.js +++ b/mes/qd/src/views/wms/scheduler_manage/task/task.js @@ -43,6 +43,12 @@ export function getAcsTaskType() { method: 'get' }) } +export function undo() { + return request({ + url: 'api/task//undo', + method: 'get' + }) +} export function getFinishType() { return request({ @@ -74,5 +80,6 @@ export default { getTaskType, getAcsTaskType, getFinishType, - scheduler + scheduler, + undo } diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue index 8f49a3ed..bbee711c 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/TaskDialog.vue @@ -35,51 +35,34 @@ @row-click="clcikRow" > - - - + - + - +
入库单据任务项 - 删除 @@ -90,7 +73,8 @@ type="warning" icon="el-icon-check" size="mini" - @click="reIssueTask()" + :disabled="dis_send" + @click="sendTask()" > 下发 @@ -100,20 +84,11 @@ type="warning" icon="el-icon-check" size="mini" + :disabled="dis_confirm" @click="confirmTask()" > 标识完成 -
@@ -130,33 +105,30 @@ @row-click="clcikDisRow" > - - - - - + + + - - - - - + + + + + - - + diff --git a/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js b/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js new file mode 100644 index 00000000..bd560a4d --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productIvt/productivt.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/stIvtStructivtCp', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/stIvtStructivtCp/delete', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/stIvtStructivtCp/update', + method: 'post', + data + }) +} + +export default { + add, + edit, + del +} diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue new file mode 100644 index 00000000..9b6c0f65 --- /dev/null +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/TaskDialog.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue index 7d395134..bf5c6e7e 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/index.vue @@ -101,6 +101,17 @@ > 分配 + + 作业任务 + + @@ -184,10 +196,11 @@ import AddDialog from '@/views/wms/storage_manage/product/productOut/AddDialog' import DivDialog from '@/views/wms/storage_manage/product/productOut/DivDialog' import ViewDialog from '@//views/wms/storage_manage/product/productOut/ViewDialog' import crudStorattr from '@/views/wms/storage_manage/basedata/basedata' +import TaskDialog from '@/views/wms/storage_manage/product/productOut/TaskDialog' export default { name: 'ProductOut', - components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog }, + components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog, TaskDialog }, cruds() { return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/productOut', crudMethod: { ...productOut }, optShow: { @@ -209,10 +222,12 @@ export default { edit: ['admin', 'checkoutbill:edit'], del: ['admin', 'checkoutbill:del'] }, + task_flag: true, openMoneyDialog: false, loadingConfirm: false, divShow: false, taskShow: false, + taskOpenParam: [], dis_flag: true, work_flag: true, confirm_flag: true, @@ -281,6 +296,11 @@ export default { } else { this.confirm_flag = true } + if (current.bill_status !== '99') { + this.task_flag = false + } else { + this.task_flag = true + } } }, stateFormat(row, column) { @@ -294,6 +314,7 @@ export default { this.dis_flag = true this.confirm_flag = true this.work_flag = true + this.task_flag = true this.currentRow = {} } }, @@ -308,6 +329,12 @@ export default { this.mstrow = this.currentRow }) }, + taskOpen() { + productOut.getIosInvDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => { + this.taskOpenParam = res + }) + this.taskShow = true + }, confirm() { this.loadingConfirm = true productOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => { diff --git a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js index 14f7e2d8..f1b19c92 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js +++ b/mes/qd/src/views/wms/storage_manage/product/productOut/productout.js @@ -88,6 +88,30 @@ export function manualDiv(data) { }) } +export function delTask(data) { + return request({ + url: '/api/productOut/delTask', + method: 'post', + data + }) +} + +export function sendTask(data) { + return request({ + url: '/api/productOut/sendTask', + method: 'post', + data + }) +} + +export function confirmTask(data) { + return request({ + url: '/api/productOut/confirmTask', + method: 'post', + data + }) +} + export default { add, edit, @@ -99,5 +123,8 @@ export default { setPoint, confirm, getStructIvt, - manualDiv + manualDiv, + delTask, + sendTask, + confirmTask } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java new file mode 100644 index 00000000..ceece3bf --- /dev/null +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/RemoveDevicePhase.java @@ -0,0 +1,11 @@ +package org.nl.acs.device_driver.basedriver.hailiang_one; + +import org.nl.acs.instruction.service.dto.Instruction; + +/** + * @author: geng by + * @createDate: 2023/6/9 + */ +public interface RemoveDevicePhase { + public void set(int agvphase, int index, Instruction inst); +} diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java index 0bbb62ac..13909923 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java @@ -15,6 +15,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl; import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -41,7 +42,7 @@ import java.util.*; @Slf4j @Data @RequiredArgsConstructor -public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); @@ -477,11 +478,12 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i } else if (agvphase == 0x0C || agvphase == 0x23) { //agv送满框1完毕或送满框2完毕 //需要判断缓存线工作模式联机，对接位有货，任务号不为0，对接位条码正常才反馈agv以及电气放货完成 - if (mode == 1 && in_finish == 1 && task != 0 && docking_barcode != 0 && error != 35 && ObjectUtil.isNotEmpty(inst) && Integer.parseInt(inst.getInstruction_code()) == task) { + if (mode == 1 && task != 0 && docking_barcode != 0 && error != 34 && ObjectUtil.isNotEmpty(inst) && Integer.parseInt(inst.getInstruction_code()) == task) { if (inst != null) { TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); if (taskDto != null) { taskDto.setExt_param(new HashMap<>()); + taskDto.setTask_status(StatusEnum.TASK_RUNNING.getCode()); taskDto.getExt_param().put("inbox", "" + docking_barcode); taskDto.setVehicle_code(String.valueOf(docking_barcode)); taskserver.update(taskDto); @@ -504,9 +506,9 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i if (prepare_ready != 1) { noFeedMessage += "准备位未就绪,"; } - if (in_ready != 1) { - noFeedMessage += "对接位入箱未就绪,"; - } +// if (in_ready != 1) { +// noFeedMessage += "对接位入箱未就绪,"; +// } if (error == 35) { noFeedMessage += "准备位条码异常,"; } @@ -535,12 +537,12 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i this.noFeedAgvMessage = this.replace(noFeedMessage); } } else if (agvphase == 0x10 || agvphase == 0x27) { + Map map = new LinkedHashMap<>(); + map.put("to_agv_get_finish", "1"); + map.put("to_agv_put_finish", "0"); + this.writing(map); //agv取空框1完毕或取空框2完毕 - if (mode == 1 && move == 0 && ObjectUtil.isNotEmpty(inst)) { - Map map = new LinkedHashMap<>(); - map.put("to_agv_get_finish", "1"); - map.put("to_agv_put_finish", "0"); - this.writing(map); + if (mode == 1 && move == 0 && task_finish == 1 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status(InstActionEnum.EXECUTE_GET_EMPTY_FINISH.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvTwoModeInst(agvphase, index, 0); @@ -558,6 +560,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i .findFirst() .orElse(null); if (instruction != null) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } instructionService.issuedCacheInfo(instruction); logServer.deviceExecuteLog(device_code, "", "", "第一条指令完成,指令号:'" + inst.getInstruction_code() + "',下发第二条指令,指令号:'" + instruction.getInstruction_code() + "'"); } @@ -632,6 +639,11 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i Map map = new LinkedHashMap<>(); map.put("to_agv_get_finish", "1"); if (task == 0 || Integer.parseInt(inst.getTask_code()) == task) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } map.put("to_task_finish", "1"); } this.writing(map); @@ -672,7 +684,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i } } else if (agvphase == 0x15 || agvphase == 0x19) { //缓存线出满框送回空框完毕 - if (mode == 1 && in_finish == 1 && ObjectUtil.isNotEmpty(inst)) { + if (mode == 1 && docking_barcode > 0 && error != 34 && ObjectUtil.isNotEmpty(inst)) { this.writing("to_agv_put_finish", "1"); inst.setExecute_status(InstActionEnum.EXECUTE_PUT_EMPTY_FINISH.getCode()); instructionService.update(inst); @@ -687,9 +699,9 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i this.set(0, 0, null); } else { String noFeedMessage = this.noFeedMessage(); - if (in_finish != 1) { - noFeedMessage += "电气未上报对接位入箱完成,"; - } +// if (in_finish != 1) { +// noFeedMessage += "电气未上报对接位入箱完成,"; +// } this.noFeedAgvMessage = this.replace(noFeedMessage); } } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java index 538bee80..5fa240d2 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java @@ -12,8 +12,11 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.dto.DeviceErrorLogDto; @@ -39,7 +42,7 @@ import java.util.Map; @Slf4j @Data @RequiredArgsConstructor -public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); @@ -51,6 +54,8 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); @Autowired TaskService taskserver = SpringContextHolder.getBean(TaskService.class); + @Autowired + AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); int mode = 0; //储料仓运行中 @@ -140,10 +145,14 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO logServer.deviceExecuteLog(this.device_code, "", "", "信号is_open：" + last_is_open + "->" + is_open); } if (silo_weight != last_silo_weight) { - Map feedNumMap = new HashMap<>(); - feedNumMap.put("qty", this.getFull_number()); - feedNumMap.put("weight", this.getSilo_weight()); - MonitoringLargeScreenData.deviceNumData.put(this.device_code, feedNumMap); + if (is_open == 1) { + Map feedNumMap = new HashMap<>(); + feedNumMap.put("qty", this.getFull_number()); + feedNumMap.put("weight", this.getSilo_weight()); + Map> fm = new HashMap<>(); + fm.put(this.device_code, feedNumMap); + acsToWmsService.feedDeviceNum2(fm); + } logServer.deviceExecuteLog(this.device_code, "", "", "信号silo_weight：" + last_silo_weight + "->" + silo_weight); } if (full_number != last_full_number) { @@ -162,16 +171,16 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO //this.setIserror(true); message = "信号量同步异常"; //未联机 - } /*else if (mode == 0) { + } else if (mode == 0) { message = "未联机"; - } */ else { - this.setIsonline(true); - this.setIserror(false); + } else { + //this.setIsonline(true); + //this.setIserror(false); message = null; //agv到达倒料点 if (agvphase == 0x0B || agvphase == 0x0F) { //判断储料仓联机、无故障、agv执行执行物料编号和上次倒料编号一致或者上次物料清空才允许倒料 - if (ObjectUtil.isNotEmpty(inst)) { + if (mode == 1 && ObjectUtil.isNotEmpty(inst)) { inst.setExecute_status(InstActionEnum.EXECUTE_TO_PUT_FALL_SEND_FULL.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvTwoModeInst(agvphase, index, 0); @@ -182,6 +191,9 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO logServer.deviceExecuteLog(device_code, "", "", this.messageInfo(agvphase)); } else { String notFeedAgvMessage = ""; + if (mode != 1) { + notFeedAgvMessage += "设备未联机,"; + } if (inst == null) { notFeedAgvMessage += "AGV指令为空,"; } @@ -191,7 +203,7 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO //agv倒料完成 if (agvphase == 0x0D || agvphase == 0x11) { - if (ObjectUtil.isNotEmpty(inst)) { + if (mode == 1 && ObjectUtil.isNotEmpty(inst)) { //下发储料仓倒料数量及开始称重 Map map = new LinkedHashMap<>(); map.put("to_dumping_num", inst.getQuantity()); @@ -215,6 +227,9 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO logServer.deviceExecuteLog(device_code, "", "", this.messageInfo(agvphase)); } else { String notFeedAgvMessage = ""; + if (mode != 1) { + notFeedAgvMessage += "设备未联机,"; + } if (inst == null) { notFeedAgvMessage += "AGV指令为空,"; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java index 3d963e86..0ee89c2b 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java @@ -17,6 +17,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo; import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -52,7 +53,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo { +public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java index 57db38ab..a0b0b825 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java @@ -140,8 +140,10 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order); } if (now_order_prod_num != last_now_order_prod_num) { - if (mode == 1 && order > 0) { - MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num); + if (mode == 1 && order > 0 && order_prod_allnum > 0) { + if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) { + MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num); + } } logServer.deviceExecuteLog(this.device_code, "", "", "信号now_order_prod_num：" + last_now_order_prod_num + "->" + now_order_prod_num); } @@ -329,7 +331,7 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl } else { map.put("to_confirm_finished", "1"); } - //map.put("to_order", "0"); + map.put("to_order", "0"); map.put("to_clear", "1"); this.writing(map); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java index 217b6c14..930fdeb5 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java @@ -11,6 +11,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl; import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.history.ErrorUtil; @@ -36,7 +37,7 @@ import java.util.HashMap; @Slf4j @Data @RequiredArgsConstructor -public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java index 7b68c90b..62d04366 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java @@ -14,6 +14,7 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -47,7 +48,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); @@ -287,6 +288,9 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice redisUtils.setExpire(this.device_code, null, ApplyTaskTime.APPLY_TIME, TimeUnit.SECONDS); //判断是否需要AGV搬运 需要就申请任务 不需要不申请 ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder())); +// if (produceshiftorderDto == null) { +// produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder())); +// } if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) { JSONObject reqParam = new JSONObject(); reqParam.put("device_code", this.getDevice_code()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java index 9e5263f1..9f3f29a2 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java @@ -15,6 +15,7 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -49,7 +50,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java index 2c38fafa..3714d17e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java @@ -18,6 +18,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; import org.nl.acs.device_driver.basedriver.hailiang_one.IssuedDeviceOrderInfo; import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -53,7 +54,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo { +public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java index 2a2a8962..06e1cad5 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java @@ -53,6 +53,8 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme @Autowired DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); + + int heartbeat = 0; int mode = 0; int error = 0; int now_one_box_num = 0; @@ -63,6 +65,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme int order = 0; int order_prod_allnum = 0; + int last_heartbeat = 0; int last_mode = 0; int last_error = 0; int last_finish = 0; @@ -97,6 +100,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme public synchronized void execute() { try { device_code = this.getDeviceCode(); + heartbeat = this.itemProtocol.getHeartbeat(); error = this.itemProtocol.getError(); order = this.itemProtocol.getOrder(); mode = this.itemProtocol.getItem_mode(); @@ -137,6 +141,13 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme } if (order_compel_finish != last_order_compel_finish) { + if (order_compel_finish == 1) { + Map map = new LinkedHashMap<>(); + map.put("to_confirm_finished", "1"); + map.put("to_clear", "1"); + map.put("to_order", "0"); + this.writing(map); + } luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_order_compel_finish, String.valueOf(this.last_order_compel_finish), String.valueOf(this.order_compel_finish))); logServer.deviceExecuteLog(this.device_code, "", "", "信号order_compel_finish：" + last_order_compel_finish + "->" + order_compel_finish); } @@ -145,8 +156,10 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order); } if (now_order_prod_num != last_now_order_prod_num) { - if (mode == 1 && order > 0) { - MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num); + if (mode == 1 && order > 0 && order_prod_allnum > 0) { + if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) { + MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num); + } } luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_now_order_prod_num, String.valueOf(this.last_now_order_prod_num), String.valueOf(this.now_order_prod_num))); logServer.deviceExecuteLog(this.device_code, "", "", "信号now_order_prod_num：" + last_now_order_prod_num + "->" + now_order_prod_num); @@ -171,6 +184,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme feedDeviceStatusFlag = false; logServer.deviceExecuteLog(this.device_code, "", "", "信号isonline：" + last_isonline + "->" + isonline); } + if (!this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) { JSONObject chm = new JSONObject(); chm.put("device_code", this.getDevice_code()); @@ -189,7 +203,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme chm.put("error_code", String.valueOf(error)); acsToWmsService.feedDeviceStatusType(chm); feedDeviceStatusFlag = true; - } else if (this.itemProtocol.getIsonline() && mode == 1 && order > 0 && !feedDeviceStatusFlag) { + } else if (this.itemProtocol.getIsonline() && mode == 1 && order > 0 && order_prod_allnum > 0 && !feedDeviceStatusFlag) { JSONObject chm = new JSONObject(); chm.put("device_code", this.getDevice_code()); //设备生产中 @@ -198,7 +212,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme chm.put("error_code", "0"); acsToWmsService.feedDeviceStatusType(chm); feedDeviceStatusFlag = true; - } else if (this.itemProtocol.getIsonline() && mode == 0 && order > 0 && !feedDeviceStatusFlag) { + } else if (this.itemProtocol.getIsonline() && mode == 0 && order > 0 && order_prod_allnum > 0 && !feedDeviceStatusFlag) { JSONObject chm = new JSONObject(); chm.put("device_code", this.getDevice_code()); //设备待生产 @@ -230,7 +244,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme } //修改工单状态为自动完成 - if (mode == 1 && finish != last_finish && finish == 1 && order > 0 && now_order_prod_num == order_prod_allnum) { + if (mode == 1 && finish != last_finish && finish == 1 && order_compel_finish != 1 && order > 0 && now_order_prod_num == order_prod_allnum) { ProduceshiftorderDto pdto = produceshiftorderService.findByCodeFromCache(String.valueOf(order)); if (pdto != null) { if (pdto.getOrder_status().equals(WorkerOrderEnum.PRODUCTING.getCode())) { @@ -269,6 +283,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme last_line_stock_num = line_stock_num; last_order_prod_allnum = order_prod_allnum; last_isonline = isonline; + last_heartbeat = heartbeat; } @@ -299,12 +314,12 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme Map map = new LinkedHashMap<>(); if (StrUtil.equals(autoFinish, WorkerOrderEnum.FORCEFINISH.getCode())) { map.put("to_order_compel_finished", "1"); - map.put("to_confirm_finished", "1"); + //map.put("to_confirm_finished", "1"); } else { map.put("to_confirm_finished", "1"); + map.put("to_order", "0"); + map.put("to_clear", "1"); } - //map.put("to_order", "0"); - map.put("to_clear", "1"); this.writing(map); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java index 512fd091..f89b1158 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java @@ -11,6 +11,7 @@ import org.nl.acs.agv.server.impl.NDCAgvServiceImpl; import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.history.ErrorUtil; @@ -35,7 +36,7 @@ import java.util.HashMap; @Slf4j @Data @RequiredArgsConstructor -public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java index 5702b9f1..11c9ac55 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java @@ -14,6 +14,7 @@ import org.nl.acs.auto.run.NDCSocketConnectionAutoRun; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -47,7 +48,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); @@ -291,6 +292,9 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri //判断是否需要AGV搬运 需要就申请任务 不需要不申请 JSONObject reqParam = new JSONObject(); ProduceshiftorderDto produceshiftorderDto = produceshiftorderService.findByCodeFromCache(String.valueOf(this.getOrder())); +// if (produceshiftorderDto == null) { +// produceshiftorderDto = produceshiftorderService.findByCode(String.valueOf(this.getOrder())); +// } if (produceshiftorderDto != null && StrUtil.equals(produceshiftorderDto.getIs_needmove(), StatusEnum.NEED_MOVE.getCode())) { reqParam.put("type", StatusEnum.FULL_REQ.getCode()); reqParam.put("device_code", this.getDevice_code()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java index 0a8241d0..ee150f9d 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java @@ -15,6 +15,7 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_one.ApplyTaskTime; import org.nl.acs.device_driver.basedriver.hailiang_one.MonitoringLargeScreenData; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; @@ -49,7 +50,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Data @RequiredArgsConstructor -public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { +public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, RemoveDevicePhase { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 3bc7715b..a16d717c 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -54,6 +54,14 @@ public interface AcsToWmsService { */ HttpResponse feedDeviceNum(Map> map); + /** + * 反馈储料仓料口数量 + * + * @param map + * @return + */ + HttpResponse feedDeviceNum2(Map> map); + /** * 申请扫码器任务 diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 8662c999..d1bea396 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -36,10 +36,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public HttpResponse applyTaskToWms(JSONObject param) { - log.info("acs开始向mes请求任务,请求参数:{}", JSON.toJSONString(param)); try { MDC.put(log_file_type, log_type); if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + log.info("acs开始向mes请求任务,请求参数:{}", JSON.toJSONString(param)); String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("applyTaskToWms"); String url = wmsurl + addressDto.getMethods_url(); @@ -202,11 +202,38 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - public HttpResponse applyScannerTask(JSONObject map) { - log.info("acs开始向mes申请扫码器任务,请求参数:{}", JSON.toJSONString(map)); + public HttpResponse feedDeviceNum2(Map> map) { try { MDC.put(log_file_type, log_type); if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + log.info("acs开始向mes反馈储料仓重量和数量,请求参数:{}", JSON.toJSONString(map)); + String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + AddressDto addressDto = addressService.findByCode("feedDeviceNum2"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .body(JSON.toJSONString(map)) + .execute(); + log.info("acs向mes反馈储料仓重量和数量成功,请求参数:{},请求路径:{},响应参数:{}", JSON.toJSONString(map), url, JSON.toJSONString(result)); + } catch (Exception e) { + log.error("acs向mes反馈储料仓重量和数量失败,请求参数:{},请求路径:{},失败原因:{}", JSON.toJSONString(map), url, e.getMessage()); + } + return result; + } + return null; + } finally { + MDC.remove(log_file_type); + } + } + + @Override + public HttpResponse applyScannerTask(JSONObject map) { + try { + MDC.put(log_file_type, log_type); + if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + log.info("acs开始向mes申请扫码器任务,请求参数:{}", JSON.toJSONString(map)); String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("applyScannerTask"); String methods_url = addressDto.getMethods_url(); @@ -230,10 +257,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public HttpResponse feedCacheLineBarcodes(JSONObject map) { - log.info("acs开始向mes反馈缓存线条码,请求参数:{}", JSON.toJSONString(map)); try { MDC.put(log_file_type, log_type); if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + log.info("acs开始向mes反馈缓存线条码,请求参数:{}", JSON.toJSONString(map)); String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("feedCacheLineBarcodes"); String methods_url = addressDto.getMethods_url(); @@ -257,10 +284,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public HttpResponse feedCacheLineTask(JSONObject param) { - log.info("acs开始向mes反馈缓存线任务号,请求参数:{}", JSON.toJSONString(param)); try { MDC.put(log_file_type, log_type); if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + log.info("acs开始向mes反馈缓存线任务号,请求参数:{}", JSON.toJSONString(param)); String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("feedCacheLineTask"); String methods_url = addressDto.getMethods_url(); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 42e51f16..cbcbf7b8 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -711,6 +711,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (code.equals("to_start_checking")) { hailiangAutoCacheLineDeviceDriver.writing("to_task", "1001"); } + if (code.equals("to_check_finish")){ + hailiangAutoCacheLineDeviceDriver.writing("to_task", "0"); + } } } JSONObject resultJson = new JSONObject(); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java index 8f481493..b0622e69 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -349,5 +349,5 @@ public interface InstructionService { */ void removeCacheLinePhase(Instruction dto); - Instruction findInstByPutDeviceCode(String put_device_code); + Instruction findInstByDeviceCode(String device_code); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index e06f704c..142b7f17 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; +import org.nl.acs.device_driver.basedriver.hailiang_one.RemoveDevicePhase; import org.nl.acs.device_driver.basedriver.hailiang_one.hailiang_auto_cache_line.HailiangAutoCacheLineDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; @@ -127,12 +128,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu return true; }) .sorted((inst1, inst2) -> (inst1.getInstruction_code().compareTo(inst2.getInstruction_code()))) - .skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) .collect(Collectors.toList()); + List skipList = instructionList.stream().skip((currentPageNumber - 1) * pageMaxSize) + .limit(pageMaxSize).collect(Collectors.toList()); JSONObject jo = new JSONObject(); - jo.put("content", instructionList); - jo.put("totalElements", this.instructions.size()); + jo.put("content", skipList); + jo.put("totalElements", instructionList.size()); return jo; } @@ -1333,8 +1334,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu if (putDevice != null) { if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) { - throw new BadRequestException("缓存线已存在任务,稍后下发!"); + if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0 || !hailiangAutoCacheLineDeviceDriver.getIsonline()) { + throw new BadRequestException("缓存线已存在任务或设备不在线,稍后下发!"); } else if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) { //下发电气单出 to_task_type = "4"; @@ -1348,8 +1349,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0) { - throw new BadRequestException("缓存线已存在任务,稍后下发!"); + if (hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") != 0 || !hailiangAutoCacheLineDeviceDriver.getIsonline()) { + throw new BadRequestException("缓存线已存在任务或设备不在线,稍后下发!"); } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getItemProtocol().getOpcIntegerValue("task") == 0) { //下发电气单入 to_task_type = "2"; @@ -1431,31 +1432,35 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu Device start_device = deviceAppService.findDeviceByCode(start_point_code); Device next_device = deviceAppService.findDeviceByCode(next_point_code); Device put_device = deviceAppService.findDeviceByCode(put_point_code); - HailiangAutoCacheLineDeviceDriver hailiangAutoCacheLineDeviceDriver; - if (put_device != null && put_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { - hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) put_device.getDeviceDriver(); - hailiangAutoCacheLineDeviceDriver.set(0, 0, null); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) { - hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1"); - } + RemoveDevicePhase removeDevicePhase; + if (put_device != null && put_device.getDeviceDriver() instanceof RemoveDevicePhase) { + removeDevicePhase = (RemoveDevicePhase) put_device.getDeviceDriver(); + removeDevicePhase.set(0, 0, null); +// if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) { +// hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1"); +// } } - if (start_device != null && next_device != null && start_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver && next_device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { - hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) start_device.getDeviceDriver(); - hailiangAutoCacheLineDeviceDriver.set(0, 0, null); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) { - hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1"); - } + if (start_device != null && start_device.getDeviceDriver() instanceof RemoveDevicePhase) { + removeDevicePhase = (RemoveDevicePhase) start_device.getDeviceDriver(); + removeDevicePhase.set(0, 0, null); +// if (hailiangAutoCacheLineDeviceDriver.getTask() != 0 && hailiangAutoCacheLineDeviceDriver.getTask() == Integer.parseInt(dto.getInstruction_code())) { +// hailiangAutoCacheLineDeviceDriver.writing("to_task_finish", "1"); +// } + } + if (next_device != null && next_device.getDeviceDriver() instanceof RemoveDevicePhase) { + removeDevicePhase = (RemoveDevicePhase) put_device.getDeviceDriver(); + removeDevicePhase.set(0, 0, null); } } } @Override - public Instruction findInstByPutDeviceCode(String put_device_code) { + public Instruction findInstByDeviceCode(String device_code) { return Optional .ofNullable(this.instructions) .orElse(new CopyOnWriteArrayList<>()) .stream() - .filter(i -> i.getPut_device_code().equals(put_device_code)) + .filter(i -> i.getPut_device_code().equals(device_code) || i.getStart_device_code().equals(device_code) || i.getNext_device_code().equals(device_code)) .findFirst() .orElse(null); } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java index f448de73..b513eea4 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -40,7 +40,7 @@ public class OpcUtl { Map e=null; try{ e=group.write(requests); - group.write(requests); + //group.write(requests); }catch (Exception e1){ try{ e= group.write(requests); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index c21b1461..aa4ce8c8 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -116,9 +116,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A .skip((currentPageNumber - 1) * pageMaxSize) .limit(pageMaxSize) .collect(Collectors.toList()); + List skipList = orderList.stream().skip((currentPageNumber - 1) * pageMaxSize) + .limit(pageMaxSize) + .collect(Collectors.toList()); JSONObject jo = new JSONObject(); - jo.put("content", orderList); - jo.put("totalElements", this.order.size()); + jo.put("content", skipList); + jo.put("totalElements", orderList.size()); return jo; } @@ -147,7 +150,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Override public ProduceshiftorderDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); - JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'").uniqueResult(0); + JSONObject json = wo.query("order_code ='" + code + "' and is_deleted = '0'", "create_time").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { return null; } @@ -450,7 +453,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A } - @Override public void addDeviceIsOnline(String device_code, ProduceshiftorderDto dto) { WQLObject wo = WQLObject.getWQLObject("acs_deviceisonline"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 81619542..c8cc907f 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -171,12 +171,13 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { return true; }) .sorted((task1, task2) -> DateUtil.compare(DateUtil.parseDate(task1.getCreate_time()), DateUtil.parse(task2.getCreate_time()))) - .skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) .collect(Collectors.toList()); + List skipList = taskList.stream().skip((currentPageNumber - 1) * pageMaxSize) + .limit(pageMaxSize) + .collect(Collectors.toList()); JSONObject jo = new JSONObject(); - jo.put("content", taskList); - jo.put("totalElements", this.tasks.size()); + jo.put("content", skipList); + jo.put("totalElements", taskList.size()); return jo; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql index 47421336..4bb1d83e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql @@ -107,9 +107,7 @@ IF 输入.flag = "2" OR task.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%') OR - task.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' ) - OR - task.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%') + task.put_point_code LIKE CONCAT ( '%', 输入.point_code, '%' ) ) ENDOPTION OPTION 输入.create_time <> "" diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java index 4548932b..59916b00 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java +++ b/wcs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java @@ -94,7 +94,7 @@ public class AutoCreateInst { Device device = deviceAppService.findDeviceByCode(put_device_code); if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(put_device_code) != null) { continue; } } @@ -105,7 +105,7 @@ public class AutoCreateInst { Device device = deviceAppService.findDeviceByCode(start_device_code); if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(start_device_code) != null) { continue; } } @@ -143,7 +143,7 @@ public class AutoCreateInst { Device device = deviceAppService.findDeviceByCode(taskDto1.getPut_device_code()); if (device != null && device.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) { hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) device.getDeviceDriver(); - if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) { + if (hailiangAutoCacheLineDeviceDriver.getMode() != 1 || hailiangAutoCacheLineDeviceDriver.getTask() != 0 || instructionService.findInstByDeviceCode(taskDto1.getPut_device_code()) != null) { continue; } }