diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/AcsCacheLineController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/AcsCacheLineController.java deleted file mode 100644 index 2d3bb63..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/AcsCacheLineController.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.nl.wms.cacheline.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.cacheline.service.AcsCacheLineService; -import org.nl.wms.cacheline.service.CacheLineHandService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @author qinx - * @date 2022-05-25 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "缓存线条码管理") -@RequestMapping("/api/acs/cacheLine/") -@Slf4j -public class AcsCacheLineController { - - private final AcsCacheLineService acsCacheLineService; - - @PostMapping("/getEmptyStruct") - @Log("获取一个空的缓存线货位") - @ApiOperation("获取一个空的缓存线货位") - public ResponseEntity getEmptyStruct(@RequestBody Map whereJson) { - - return new ResponseEntity<>(acsCacheLineService.getEmptyStruct(whereJson), HttpStatus.OK); - } - - @PostMapping("/getFullStruct") - @Log("获取一个有料的缓存线货位") - @ApiOperation("获取一个有料的缓存线货位") - public ResponseEntity getFullStruct(@RequestBody Map whereJson) { - - return new ResponseEntity<>(acsCacheLineService.getFullStruct(whereJson), HttpStatus.OK); - } - - @PostMapping("/updateStruct") - @Log("更新缓存线货位") - @ApiOperation("更新缓存线货位") - public ResponseEntity updateStruct(@RequestBody Map whereJson) { - return new ResponseEntity<>(acsCacheLineService.updateStruct(whereJson), HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/CacheLineHandController.java deleted file mode 100644 index 03b973f..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/CacheLineHandController.java +++ /dev/null @@ -1,206 +0,0 @@ -package org.nl.wms.cacheline.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.cacheline.service.CacheLineHandService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @author qinx - * @date 2022-05-25 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "缓存线条码管理") -@RequestMapping("/api/cacheLine/pda") -@Slf4j -public class CacheLineHandController { - - private final CacheLineHandService cacheLineHandService; - - @PostMapping("/semiMaterialSpecQuery") - @Log("半成品物料规格查询") - @ApiOperation("半成品物料规格查询") - public ResponseEntity semiMaterialSpecQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.semiMaterialSpecQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/workprocedureQuery") - @Log("工序下拉框查询") - @ApiOperation("工序下拉框查询") - public ResponseEntity workprocedureQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.workprocedureQuery(whereJson), HttpStatus.OK); - } - - - @PostMapping("/cacheLineMaterInfoQuery") - @Log("缓存线料箱条码查询料箱信息") - @ApiOperation("缓存线料箱条码查询料箱信息") - public ResponseEntity cacheLineMaterInfoQuery(@RequestBody Map whereJson) { - return new ResponseEntity<>(cacheLineHandService.cacheLineMaterInfoQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/deviceQuery") - @Log("缓存线设备下拉框查询") - @ApiOperation("缓存线设备下拉框查询") - public ResponseEntity deviceQuery(@RequestBody Map whereJson) { - return new ResponseEntity<>(cacheLineHandService.deviceQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/inOutEmptyBox") - @Log("空箱初始化--出入空箱") - @ApiOperation("空箱初始化--出入空箱") - public ResponseEntity inOutEmptyBox(@RequestBody Map whereJson) { - return new ResponseEntity<>(cacheLineHandService.inOutEmptyBox(whereJson), HttpStatus.OK); - } - - @PostMapping("/inOutExceptionInstQuery") - @Log("缓存线出入箱异常指令查询") - @ApiOperation("缓存线出入箱异常指令查询") - public ResponseEntity inOutExceptionInstQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.inOutExceptionInstQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/inOutExceptionInstConfirm") - @Log("缓存线出入箱异常指令确认") - @ApiOperation("缓存线出入箱异常指令确认") - public ResponseEntity inOutExceptionInstConfirm(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.inOutExceptionInstConfirm(whereJson), HttpStatus.OK); - } - - @PostMapping("/setfullBox") - @Log("设置满匡") - @ApiOperation("设置满匡") - public ResponseEntity setfullBox(@RequestBody Map whereJson) { - return new ResponseEntity<>(cacheLineHandService.setfullBox(whereJson), HttpStatus.OK); - } - - @PostMapping("/setEmptyBox") - @Log("设置空匡") - @ApiOperation("设置空匡") - public ResponseEntity setEmptyBox(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.setEmptyBox(whereJson), HttpStatus.OK); - } - - @PostMapping("/agvInBoxExceptionQuery") - @Log("AGV入箱异常-查询") - @ApiOperation("AGV入箱异常-查询") - public ResponseEntity agvInBoxExceptionQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.agvInBoxExceptionQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/agvInBoxExceptionConfirm") - @Log("AGV入箱异常-确认") - @ApiOperation("AGV入箱异常-确认") - public ResponseEntity agvInBoxExceptionConfirm(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.agvInBoxExceptionConfirm(whereJson), HttpStatus.OK); - } - - @PostMapping("/agvOutBoxExceptionQuery") - @Log("AGV出箱异常-查询") - @ApiOperation("AGV出箱异常-查询") - public ResponseEntity agvOutBoxExceptionQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.agvOutBoxExceptionQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/agvOutBoxExceptionConfirm") - @Log(" AGV出箱异常-确认") - @ApiOperation(" AGV出箱异常-确认") - public ResponseEntity agvOutBoxExceptionConfirm(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.agvOutBoxExceptionConfirm(whereJson), HttpStatus.OK); - } - - @PostMapping("/cacheLineOutBoxExceptionQuery") - @Log("缓存线出箱异常-查询") - @ApiOperation("缓存线出箱异常-查询") - public ResponseEntity cacheLineOutBoxExceptionQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.cacheLineOutBoxExceptionQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/cacheLineOutBoxExceptionConfirm") - @Log("缓存线出箱异常-确认") - @ApiOperation("缓存线出箱异常-确认") - public ResponseEntity cacheLineOutBoxExceptionConfirm(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.cacheLineOutBoxExceptionConfirm(whereJson), HttpStatus.OK); - } - - - @PostMapping("/materialQuery") - @Log("物料信息查询") - @ApiOperation("物料信息查询") - public ResponseEntity materialQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.materialQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/setBlankPos") - @Log("设置缓存线货位为空位置") - @ApiOperation("设置缓存线货位为空位置") - public ResponseEntity setBlankPos(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.setBlankPos(whereJson), HttpStatus.OK); - } - - @PostMapping("/instStatusQuery") - @Log("指令状态下拉框查询") - @ApiOperation("指令状态下拉框查询") - public ResponseEntity instStatusQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.instStatusQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/cacheLineExcepOpt") - @Log("缓存线异常处理") - @ApiOperation("缓存线异常处理") - public ResponseEntity cacheLineExcepOpt(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.cacheLineExcepOpt(whereJson), HttpStatus.OK); - } - - @PostMapping("/instPageQuery") - @Log("指令分页查询") - @ApiOperation("指令分页查询") - public ResponseEntity instPageQuery(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.instPageQuery(whereJson), HttpStatus.OK); - } - - @PostMapping("/instOperation") - @Log("指令操作") - @ApiOperation("指令操作") - public ResponseEntity instOperation(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.instOperation(whereJson), HttpStatus.OK); - } - - @PostMapping("/pourMaterial") - @Log("倒料操作") - @ApiOperation("倒料操作") - public ResponseEntity pourMaterial(@RequestBody Map whereJson) { - - return new ResponseEntity<>(cacheLineHandService.pourMaterial(whereJson), HttpStatus.OK); - } - - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/MateriorecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/MateriorecordController.java deleted file mode 100644 index a550eda..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/MateriorecordController.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.nl.wms.cacheline.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.cacheline.service.MateriorecordService; -import org.nl.wms.cacheline.service.dto.MateriorecordDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author qinx -* @date 2022-05-26 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "缓存线物料出入记录管理") -@RequestMapping("/api/materiorecord") -@Slf4j -public class MateriorecordController { - - private final MateriorecordService materiorecordService; - - @GetMapping - @Log("查询缓存线物料出入记录") - @ApiOperation("查询缓存线物料出入记录") - //@PreAuthorize("@el.check('materiorecord:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(materiorecordService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增缓存线物料出入记录") - @ApiOperation("新增缓存线物料出入记录") - //@PreAuthorize("@el.check('materiorecord:add')") - public ResponseEntity create(@Validated @RequestBody MateriorecordDto dto){ - materiorecordService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改缓存线物料出入记录") - @ApiOperation("修改缓存线物料出入记录") - //@PreAuthorize("@el.check('materiorecord:edit')") - public ResponseEntity update(@Validated @RequestBody MateriorecordDto dto){ - materiorecordService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除缓存线物料出入记录") - @ApiOperation("删除缓存线物料出入记录") - //@PreAuthorize("@el.check('materiorecord:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - materiorecordService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehicleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehicleController.java deleted file mode 100644 index aa4e3cc..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehicleController.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.nl.wms.cacheline.rest; - - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; - -import org.nl.wms.cacheline.service.VehicleService; -import org.nl.wms.cacheline.service.dto.VehicleDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author qinx -* @date 2022-05-25 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "缓存线条码管理") -@RequestMapping("/api/vehicle") -@Slf4j -public class VehicleController { - - private final VehicleService vehicleService; - - @GetMapping - @Log("查询缓存线条码") - @ApiOperation("查询缓存线条码") - //@PreAuthorize("@el.check('vehicle:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(vehicleService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增缓存线条码") - @ApiOperation("新增缓存线条码") - //@PreAuthorize("@el.check('vehicle:add')") - public ResponseEntity create(@Validated @RequestBody VehicleDto dto){ - vehicleService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改缓存线条码") - @ApiOperation("修改缓存线条码") - //@PreAuthorize("@el.check('vehicle:edit')") - public ResponseEntity update(@Validated @RequestBody VehicleDto dto){ - vehicleService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除缓存线条码") - @ApiOperation("删除缓存线条码") - //@PreAuthorize("@el.check('vehicle:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - vehicleService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - @PutMapping("/changeActive") - @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") - //@PreAuthorize("@el.check('store:edit')") - public ResponseEntity changeActive(@RequestBody JSONObject json) { - vehicleService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - @PutMapping("/changePrint") - @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") - //@PreAuthorize("@el.check('store:edit')") - public ResponseEntity changePrint(@RequestBody JSONObject json) { - vehicleService.changePrint(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehilematerialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehilematerialController.java deleted file mode 100644 index 28741f5..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/rest/VehilematerialController.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.nl.wms.cacheline.rest; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.cacheline.service.VehilematerialService; -import org.nl.wms.cacheline.service.dto.VehilematerialDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author qinx -* @date 2022-05-25 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "缓存线载具物料管理") -@RequestMapping("/api/vehilematerial") -@Slf4j -public class VehilematerialController { - - private final VehilematerialService vehilematerialService; - - @GetMapping - @Log("查询缓存线载具物料") - @ApiOperation("查询缓存线载具物料") - //@PreAuthorize("@el.check('vehilematerial:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(vehilematerialService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增缓存线载具物料") - @ApiOperation("新增缓存线载具物料") - //@PreAuthorize("@el.check('vehilematerial:add')") - public ResponseEntity create(@Validated @RequestBody VehilematerialDto dto){ - vehilematerialService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改缓存线载具物料") - @ApiOperation("修改缓存线载具物料") - //@PreAuthorize("@el.check('vehilematerial:edit')") - public ResponseEntity update(@Validated @RequestBody VehilematerialDto dto){ - vehilematerialService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除缓存线载具物料") - @ApiOperation("删除缓存线载具物料") - //@PreAuthorize("@el.check('vehilematerial:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - vehilematerialService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/AcsCacheLineService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/AcsCacheLineService.java deleted file mode 100644 index f83c53d..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/AcsCacheLineService.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.wms.cacheline.service; - -import java.util.Map; - -/** - * @author qinx - * @description 服务接口 - * @date 2022-05-25 - **/ -public interface AcsCacheLineService { - - /** - * 获取一个空的缓存线货位 - */ - Map getEmptyStruct(Map jsonObject); - - /** - * 获取一个有料的缓存线货位 - */ - Map getFullStruct(Map jsonObject); - - /** - * 更新缓存线货位 - */ - Map updateStruct(Map jsonObject); - - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/CacheLineHandService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/CacheLineHandService.java deleted file mode 100644 index d3736ce..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/CacheLineHandService.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.nl.wms.cacheline.service; - -import java.util.Map; - -/** - * @author qinx - * @description 服务接口 - * @date 2022-05-25 - **/ -public interface CacheLineHandService { - - /** - * 半成品物料规格查询 - */ - Map semiMaterialSpecQuery(Map jsonObject); - - /** - * 工序下拉框查询 - */ - Map workprocedureQuery(Map jsonObject); - - /** - * 缓存线料箱条码查询料箱信息 - */ - Map deviceQuery(Map jsonObject); - /** - * 缓存线料箱条码查询料箱信息 - */ - Map cacheLineMaterInfoQuery(Map jsonObject); - - /** - * 空箱初始化--出入空箱 - */ - Map inOutEmptyBox(Map jsonObject); - - /** - * 缓存线出入箱异常指令查询 - */ - Map inOutExceptionInstQuery(Map jsonObject); - - /** - * 缓存线出入箱异常指令确认 - */ - Map inOutExceptionInstConfirm(Map jsonObject); - - /** - * 设置满匡 - */ - Map setfullBox(Map jsonObject); - - /** - * 设置空匡 - */ - Map setEmptyBox(Map jsonObject); - - /** - * AGV入箱异常-查询 - */ - Map agvInBoxExceptionQuery(Map jsonObject); - - /** - * AGV入箱异常-确认 - */ - Map agvInBoxExceptionConfirm(Map jsonObject); - /** - * AGV出箱异常-查询 - */ - Map agvOutBoxExceptionQuery(Map jsonObject); - /** - * AGV出箱异常-确认 - */ - Map agvOutBoxExceptionConfirm(Map jsonObject); - - /** - * 缓存线出箱异常-查询 - */ - Map cacheLineOutBoxExceptionQuery(Map jsonObject); - - /** - * 缓存线出箱异常-确认 - */ - Map cacheLineOutBoxExceptionConfirm(Map jsonObject); - - /** - * 物料信息查询 - */ - Map materialQuery(Map jsonObject); - - /** - * 设置缓存线货位为空位置 - */ - Map setBlankPos(Map jsonObject); - - /** - * 缓存线异常处理 - */ - Map instStatusQuery(Map jsonObject); - - /** - * 缓存线异常处理 - */ - Map cacheLineExcepOpt(Map jsonObject); - - /** - * 指令操作 - */ - Map instOperation(Map jsonObject); - /** - * 倒料操作 - */ - Map pourMaterial(Map jsonObject); - /** - * 指令分页查询 - */ - Map instPageQuery(Map jsonObject); - - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/MateriorecordService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/MateriorecordService.java deleted file mode 100644 index bb5e40e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/MateriorecordService.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.nl.wms.cacheline.service; - -import org.nl.wms.cacheline.service.dto.MateriorecordDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author qinx - * @description 服务接口 - * @date 2022-05-26 - **/ -public interface MateriorecordService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param record_uuid ID - * @return Materiorecord - */ - MateriorecordDto findById(Long record_uuid); - - /** - * 根据编码查询 - * - * @param code code - * @return Materiorecord - */ - MateriorecordDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(MateriorecordDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(MateriorecordDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehicleService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehicleService.java deleted file mode 100644 index 7d5a432..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehicleService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.nl.wms.cacheline.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.cacheline.service.dto.VehicleDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author qinx -* @date 2022-05-25 -**/ -public interface VehicleService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param vehicle_uuid ID - * @return Vehicle - */ - VehicleDto findById(Long vehicle_uuid); - - /** - * 根据编码查询 - * @param code code - * @return Vehicle - */ - VehicleDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(VehicleDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(VehicleDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - void changeActive(JSONObject json); - void changePrint(JSONObject json); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehilematerialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehilematerialService.java deleted file mode 100644 index c3e873e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/VehilematerialService.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.nl.wms.cacheline.service; - -import org.nl.wms.cacheline.service.dto.VehilematerialDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author qinx -* @date 2022-05-25 -**/ -public interface VehilematerialService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param vehmaterial_uuid ID - * @return Vehilematerial - */ - VehilematerialDto findById(Long vehmaterial_uuid); - - /** - * 根据编码查询 - * @param code code - * @return Vehilematerial - */ - VehilematerialDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(VehilematerialDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(VehilematerialDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/MateriorecordDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/MateriorecordDto.java deleted file mode 100644 index 46c7340..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/MateriorecordDto.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.nl.wms.cacheline.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author qinx -* @date 2022-05-26 -**/ -@Data -public class MateriorecordDto implements Serializable { - - /** 记录标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long record_uuid; - - /** 缓存线标识 */ - private Long device_uuid; - - /** 缓存线编码 */ - private String extdevice_code; - - /** 缓存线名字 */ - private String device_name; - - /** 缓存线层数 */ - private BigDecimal layer_num; - - /** 出入类型 */ - private String io_type; - - /** 载具标识 */ - private Long vehicle_uuid; - - /** 载具编码 */ - private String vehicle_code; - - /** 工序标识 */ - private Long workprocedure_uuid; - - /** 载具状态 */ - private String vehicle_status; - - /** 物料标识 */ - private Long material_uuid; - - /** 料箱物料数量 */ - private BigDecimal quantity; - - /** 料箱物料重量 */ - private BigDecimal weight; - - /** 物料工单标识 */ - private Long produceorder_uuid; - - /** 物料工单编码 */ - private String produceorder_code; - - /** 创建时间 */ - private String create_time; - - /** 更新时间 */ - private String update_time; - - /** 是否可用 */ - private String is_active; - - /** 是否删除 */ - private String is_delete; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehicleDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehicleDto.java deleted file mode 100644 index c2f7963..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehicleDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.nl.wms.cacheline.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author qinx -* @date 2022-05-25 -**/ -@Data -public class VehicleDto implements Serializable { - - /** 载具标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long vehicle_uuid; - - /** 载具编码 */ - private String vehicle_code; - - /** 打印次数 */ - private BigDecimal print_num; - - /** 是否打印 */ - private String is_print; - - /** 创建时间 */ - private String create_time; - - /** 更新时间 */ - private String update_time; - - /** 打印时间 */ - private String print_time; - - /** 是否可用 */ - private String is_active; - - /** 是否删除 */ - private String is_delete; - - /** 创建人 */ - private Long create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 修改人 */ - private Long update_optid; - - /** 修改人姓名 */ - private String update_optname; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehilematerialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehilematerialDto.java deleted file mode 100644 index 4dab8b3..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/dto/VehilematerialDto.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.nl.wms.cacheline.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author qinx -* @date 2022-05-25 -**/ -@Data -public class VehilematerialDto implements Serializable { - - /** 载具库存标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long vehmaterial_uuid; - - private Long position_uuid; - - /** 载具标识 */ - private Long vehicle_uuid; - - /** 载具编码 */ - private String vehicle_code; - - /** 载具状态 */ - private String vehicle_status; - - /** 缓存线编码 */ - private String extdevice_code; - - /** 异常类型 */ - private String err_type; - - /** 物料工单标识 */ - private Long produceorder_uuid; - - /** 物料工单编码 */ - private String produceorder_code; - - /** 工序标识 */ - private Long workprocedure_uuid; - - /** 工序编号 */ - private String workprocedure_code; - - /** 工序名称 */ - private String workprocedure_name; - - /** 物料标识 */ - private Long material_uuid; - - /** 料箱物料数量 */ - private BigDecimal quantity; - - /** 料箱物料重量 */ - private BigDecimal weight; - - /** 创建时间 */ - private String create_time; - - /** 更新时间 */ - private String update_time; - - /** 是否可用 */ - private String is_active; - - /** 是否删除 */ - private String is_delete; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/AcsCacheLineServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/AcsCacheLineServiceImpl.java deleted file mode 100644 index 6550236..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/AcsCacheLineServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.nl.wms.cacheline.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.wms.cacheline.service.AcsCacheLineService; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author qinx - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class AcsCacheLineServiceImpl implements AcsCacheLineService { - - @Override - public Map getEmptyStruct(Map jsonObject) { - JSONObject result = WQL.getWO("QACS_CACHE_005").addParam("flag", "1").process().uniqueResult(0); - if (ObjectUtil.isEmpty(result)) { - throw new BadRequestException("未知道合适的位置！"); - } - return result; - } - - @Override - public Map getFullStruct(Map jsonObject) { - - //物料，工序 默认能取到 - String produceorder_uuid = jsonObject.get("produceorder_uuid"); - String material_uuid = jsonObject.get("material_uuid"); - JSONObject result = WQL.getWO("QACS_CACHE_005").addParam("flag", "2").addParam("material_uuid", material_uuid).addParam("produceorder_uuid", produceorder_uuid).process().uniqueResult(0); - if (ObjectUtil.isEmpty(result)) { - throw new BadRequestException("未知道合适的位置！"); - } - return result; - } - - @Override - public Map updateStruct(Map jsonObject) { - //默认取到 position_code(缓存线位置编码) vehicle_uuid vehicle_code - String position_code = jsonObject.get("position_code"); - String vehicle_uuid = jsonObject.get("vehicle_uuid"); - String vehicle_code = jsonObject.get("vehicle_code"); - JSONObject positionObj = WQLObject.getWQLObject("ST_CacheLine_Position").query("position_code='" + position_code + "'").uniqueResult(0); - positionObj.put("vehicle_uuid", vehicle_uuid); - positionObj.put("vehicle_code", vehicle_code); - WQLObject.getWQLObject("ST_CacheLine_Position").update(positionObj); - return null; - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/CacheLineHandServiceImpl.java deleted file mode 100644 index 85e3e38..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/CacheLineHandServiceImpl.java +++ /dev/null @@ -1,806 +0,0 @@ -package org.nl.wms.cacheline.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.wms.cacheline.service.CacheLineHandService; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author qinx - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class CacheLineHandServiceImpl implements CacheLineHandService { - - @Override - public Map semiMaterialSpecQuery(Map jsonObject) { - // 半成品规格下拉框查询 - JSONArray arr = WQL.getWO("QWCS_CACHE_004").addParam("flag", "1").process().getResultJSONArray(0); - JSONObject srb = new JSONObject(); - srb.put("result", arr); - srb.put("code", 1); - srb.put("desc", "查询成功!"); - return srb; - } - - @Override - public Map workprocedureQuery(Map jsonObject) { - // 工序下拉框查询 - JSONArray arr = WQL.getWO("QWCS_CACHE_004").addParam("flag", "2").process().getResultJSONArray(0); - JSONObject srb = new JSONObject(); - srb.put("result", arr); - srb.put("code", 1); - srb.put("desc", "查询成功!"); - return srb; - } - - @Override - public Map deviceQuery(Map jsonObject) { - //查询缓存线设备 - JSONArray arr = WQL.getWO("QWCS_CACHE_004").addParam("flag", "5").process().getResultJSONArray(0); - JSONObject srb = new JSONObject(); - srb.put("result", arr); - srb.put("code", 1); - srb.put("desc", "查询成功!"); - return srb; - } - - @Override - public Map cacheLineMaterInfoQuery(Map jsonObject) { - // 缓存线位置表【ST_cacheLine_Position】 - WQLObject positionTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - JSONArray arr = positionTab - .query("extdevice_code like '%" + jsonObject.get("wcsdevice_code") + "%'", "layer_num desc,order_no") - .getResultJSONArray(0); - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - WQLObject ivtTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - - JSONObject srb = new JSONObject(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - json.put("seat_order_num", json.get("order_no")); - // 0空位 status = 1： 绿色空箱 || status = 2：黄色满箱 || status = 3:红色异常 || status = 4 ：不显示 - json.put("weight", "0"); - json.put("quantity", "0"); - if ("0".equals(json.getString("is_show"))) { - json.put("vehicle_status", "04"); - } else {// 显示 - if ("1".equals(json.getString("is_blank"))) { - json.put("vehicle_status", "00"); - } else {// 载具不为空 - String vehicle_code = json.getString("vehicle_code"); - JSONObject ivtObj = ivtTab.query("vehicle_code = '" + vehicle_code + "' and extdevice_code like '%" - + jsonObject.get("wcsdevice_code") + "%'").uniqueResult(0); - if (ivtObj == null) { - // 异常 - json.put("vehicle_status", "03"); - } else { - json.put("vehicle_status", ivtObj.getString("vehicle_status")); - json.put("weight", ivtObj.getString("weight")); - json.put("quantity", ivtObj.getString("quantity")); - json.putAll(ivtObj); - - } - } - } - json.put("is_err", "0"); - json.put("wcsdevice_code", json.getString("extdevice_code")); - // 去掉小数 - json.put("weight", NumberUtil.roundStr(json.getString("weight"), 0)); - json.put("status", json.getString("vehicle_status").substring(1, 2)); - - if (!"00".equals(json.getString("err_type"))) { - json.put("is_err", "1"); - } - - } - - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - } - - @Override - public Map inOutEmptyBox(Map jsonObject) { - String inOut_type = jsonObject.get("inOut_type"); - String extdevice_code = jsonObject.get("wcsdevice_code"); - String vehicle_code = jsonObject.get("vehicle_code"); - - // 缓存线位置表【ST_cacheLine_Position】 - WQLObject positionTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - WQLObject vehMaterTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - // 入空箱 - if ("1".equals(inOut_type)) { - // 判断是否可以放入空箱子 - JSONObject ivtObj = positionTab.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); - // 判断箱子是否在缓存线内 - if (ivtObj != null) { - throw new BadRequestException("箱子【" + vehicle_code + "】已在库内，无法入空箱！"); - } - - // 判断是否可以放入空箱子 - JSONObject json = positionTab.query("extdevice_code = '" + extdevice_code + "' and is_blank= '1'") - .uniqueResult(0); - if (json == null) { - throw new BadRequestException("无法找到缓存线【" + extdevice_code + "】的空位，无法入空箱！"); - } - - // 入了空箱子 - JSONObject afterIvt = new JSONObject(); - afterIvt.put("vehmaterial_uuid", IdUtil.getSnowflake(1, 1).nextId()); - afterIvt.put("vehicle_uuid", vehicle_code); - afterIvt.put("vehicle_code", vehicle_code); - afterIvt.put("extdevice_code", extdevice_code); - afterIvt.put("vehicle_status", "01"); - afterIvt.put("update_time", DateUtil.now()); - afterIvt.put("create_time", DateUtil.now()); - vehMaterTab.insert(afterIvt); - - } - // 出空箱 - if ("2".equals(inOut_type)) { - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - JSONObject json = vehMaterTab.query("extdevice_code = '" + extdevice_code - + "' and vehicle_status= '01' and vehicle_code = '" + vehicle_code + "'").uniqueResult(0); - if (json == null) { - throw new BadRequestException("无法找到缓存线【" + extdevice_code + "】的空箱【" + vehicle_code + "】，出空箱失败"); - } - - // 删除掉出库的箱子 - vehMaterTab.delete("extdevice_code = '" + extdevice_code + "' and vehicle_code = '" + vehicle_code + "'"); - - } - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - } - - @Override - public Map inOutExceptionInstQuery(Map jsonObject) { - String vehicle_code = jsonObject.get("vehicle_code"); - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - String inOut_type = jsonObject.get("inOut_type"); - - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - - JSONArray result = new JSONArray(); - - // 入箱扫码异常 - if ("1".equals(inOut_type)) { - String where = "next_point_code = '" + wcsdevice_code + "' and task_status <> '06'"; - - if (StrUtil.isNotBlank(vehicle_code)) { - where = "next_point_code = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code - + "' and task_status <> '06'"; - } - JSONArray arr = instructTab.query(where).getResultJSONArray(0); - - for (int i = 0; i < arr.size(); i++) { - JSONObject row = arr.getJSONObject(i); - JSONObject json = new JSONObject(); - json.put("instruct_uuid", row.getString("instruct_uuid")); - json.put("instructorder_no", row.getString("instructorder_no")); - json.put("wcsdevice_code", row.getString("next_point_code")); - json.put("vehicle_code", row.getString("invehicle_code")); - json.put("start_point_code", row.getString("start_point_code")); - json.put("nextpoint_code", row.getString("next_point_code")); - json.put("nextpoint_code2", row.getString("next_point_code")); - result.add(json); - } - } - // 出箱扫码异常 - if ("2".equals(inOut_type)) { - String where = "start_point_code = '" + wcsdevice_code + "' and task_status <> '06'"; - - if (StrUtil.isNotBlank(vehicle_code)) { - where = "start_point_code = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code - + "' and task_status <> '06'"; - } - - JSONArray arr = instructTab.query(where).getResultJSONArray(0); - for (int i = 0; i < arr.size(); i++) { - JSONObject row = arr.getJSONObject(i); - JSONObject json = new JSONObject(); - json.put("instruct_uuid", row.getString("instruct_uuid")); - json.put("instructorder_no", row.getString("instructorder_no")); - json.put("vehicle_code", row.getString("outvehicle_code")); - json.put("wcsdevice_code", row.getString("start_point_code")); - json.put("start_point_code", row.getString("start_point_code")); - json.put("nextpoint_code", row.getString("nextpoint_code")); - json.put("nextpoint_code2", row.getString("nextpoint_code2")); - result.add(json); - } - } - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - } - - @Override - public Map inOutExceptionInstConfirm(Map jsonObject) { - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - // 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码 - String inOut_type = jsonObject.get("inOut_type"); - // 缓存线编码 - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - // - String vehicle_code = jsonObject.get("vehicle_code"); - // 指令标识 - // String instruct_uuid = jsonObject.optString("instruct_uuid"); - // JSONObject instObj = instructTab.query("instruct_uuid = '" + instruct_uuid + - // "'").uniqueResult(0); - - // 封装给wcs的数据 - Object[] data = new Object[3]; - data[0] = inOut_type; - data[1] = wcsdevice_code; - data[2] = vehicle_code; - // TODO: 2022/5/27 - /* uWcsSchedule.notifyWcs(99, 3001, data);*/ - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map setfullBox(Map jsonObject) { - String semimanufactures_uuid = jsonObject.get("material_uuid"); - // 料箱码 - String vehicle_code = jsonObject.get("vehicle_code"); - // 层数 - String layer_num = jsonObject.get("layer_num"); - // 顺序号 - String seat_order_num = jsonObject.get("seat_order_num"); - // 缓存线 - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - String weight = jsonObject.get("weight"); - String quantity = jsonObject.get("quantity"); - JSONObject srb = new JSONObject(); - if (StrUtil.isEmpty(quantity) || Double.valueOf(jsonObject.get("quantity")) <= 0) { - throw new BadRequestException("数量必须大于0"); - } - - String workprocedure_code = jsonObject.get("workprocedure_uuid"); - WQLObject positionTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - JSONObject vehiobj = positionTab.query("order_no = " + seat_order_num + " and layer_num = " + layer_num - + " and extdevice_code like '%" + wcsdevice_code + "%'").uniqueResult(0); - if (vehiobj == null) { - throw new BadRequestException("位置不存在，设置有误!"); - } - // 判断物料去的缓存线是否正确 - // PDM_BI_WorkshopMaterialCorr - WQLObject corrTab = WQLObject.getWQLObject("PDM_BI_WorkshopMaterialCorr"); - WQLObject wpTab = WQLObject.getWQLObject("PDM_BI_WorkProcedure"); - - // 设置工序信息 - JSONObject wpObj = wpTab.query("workprocedure_code = '" + workprocedure_code + "'").uniqueResult(0); - // 物料系列 - String materialprocess_series = corrTab.query("semimanufactures_uuid = '" + semimanufactures_uuid + "'") - .uniqueResult(0).getString("materialprocess_series"); - // TODO: 2022/5/27 - /* AgvTwoInst inst = new AgvTwoInst(); - String cacheLineCode2 = inst.getcacheLineCode(materialprocess_series, wpObj.optString("workprocedure_code")); -*/ - String cacheLineCode2 = ""; - if (!wcsdevice_code.equals(cacheLineCode2)) { - String materialprocess_seriesname = WQLObject.getWQLObject("PF_PB_SysDicInfo") - .query("sysdic_type = 'IF_WCS_DEVICESERIES' and sysdic_code = '" + materialprocess_series + "'") - .uniqueResult(0).getString("sysdic_name"); - throw new BadRequestException("该缓存线【" + wcsdevice_code + "】不能存放【" + materialprocess_seriesname + "】物料，操作失败!"); - } - - vehiobj.put("vehicle_code", vehicle_code); - vehiobj.put("vehicle_uuid", vehicle_code); - positionTab.update(vehiobj); - - WQLObject materTab = WQLObject.getWQLObject("PDM_BI_SemiMaterialCorr"); - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - WQLObject ivtTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - - // ivtTab.delete("extdevice_code = '" + wcsdevice_code + "' and vehicle_code = - // '" + vehicle_code + "'"); - ivtTab.delete("vehicle_code = '" + vehicle_code + "'"); - - // 物料信息 - JSONObject materObj = materTab.query("semimanufactures_uuid = '" + semimanufactures_uuid + "'").uniqueResult(0); - - HashMap json = new HashMap(); - json.put("vehmaterial_uuid", IdUtil.getSnowflake(1, 1).nextId() + ""); - json.put("vehicle_code", vehicle_code); - json.put("vehicle_uuid", vehicle_code); - json.put("extdevice_code", wcsdevice_code); - json.put("material_uuid", materObj.getString("semimanufactures_uuid")); - json.put("material_code", materObj.getString("semimanufactures_code")); - json.put("material_spec", materObj.getString("semimanufactures_spec")); - json.put("material_name", materObj.getString("semimanufactures_name")); - json.put("weight", weight); - json.put("quantity", quantity); - - json.put("workprocedure_uuid", wpObj.getString("workprocedure_uuid")); - json.put("workprocedure_code", wpObj.getString("workprocedure_code")); - json.put("workprocedure_name", wpObj.getString("workprocedure_name")); - - // 有箱有料 - json.put("vehicle_status", "02"); - json.put("create_time", DateUtil.now()); - - ivtTab.insert(json); - - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map setEmptyBox(Map jsonObject) { - JSONObject srb = new JSONObject(); - // 层数 - String layer_num = jsonObject.get("layer_num"); - // 顺序号 - String seat_order_num = jsonObject.get("seat_order_num"); - // 载具条码 - String vehicle_code = jsonObject.get("vehicle_code"); - // 缓存线编码 - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - - // 判断载具编码是否存在 - // 缓存线载具条码表【IF_cacheLine_Vehicle】 - /* - * WQLObject wql=WQLObject.getWQLObject("IF_cacheLine_Vehicle"); JSONObject - * vehiobj = - * wql.query("is_delete='0' AND is_active='1' AND vehicle_code = '"+vehicle_code - * +"'").uniqueResult(0); if (vehiobj==null) { srb.setFailure(); - * srb.setDesc("条码【" + vehicle_code + "】不存在或已被删除，操作失败!"); return srb; } - */ - // 缓存线位置表【ST_cacheLine_Position】 - WQLObject positionTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - JSONObject vehiobj = positionTab.query("order_no = " + seat_order_num + " and layer_num = " + layer_num - + " and extdevice_code like '%" + wcsdevice_code + "%'").uniqueResult(0); - if (vehiobj == null) { - throw new BadRequestException("位置不存在，设置有误!"); - } - vehiobj.put("vehicle_code", vehicle_code); - vehiobj.put("vehicle_uuid", vehicle_code); - positionTab.update(vehiobj); - - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - WQLObject ivtTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - - // 先删除空箱子位置 - // ivtTab.delete("extdevice_code = '" + wcsdevice_code + "' and vehicle_code = - // '" + vehicle_code + "'"); - ivtTab.delete("vehicle_code = '" + vehicle_code + "'"); - - JSONObject json = new JSONObject(); - // 状态设置为空箱 - json.put("vehmaterial_uuid", IdUtil.getSnowflake(1, 1).nextId() + ""); - json.put("vehicle_code", vehicle_code); - json.put("vehicle_uuid", vehicle_code); - json.put("extdevice_code", wcsdevice_code); - json.put("vehicle_status", "01"); - json.put("vehicle_code", vehicle_code); - // json.put("vehicle_uuid", vehiobj.optString("vehicle_uuid")); - - json.put("material_uuid", ""); - json.put("material_code", ""); - json.put("material_spec", ""); - json.put("material_name", ""); - json.put("weight", "0"); - json.put("quantity", "0"); - - json.put("workprocedure_uuid", ""); - json.put("workprocedure_code", ""); - json.put("workprocedure_name", ""); - json.put("create_time", DateUtil.now()); - ivtTab.insert(json); - - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - } - - @Override - public Map agvInBoxExceptionQuery(Map jsonObject) { - String vehicle_code = jsonObject.get("vehicle_code"); - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - String where = "next_point_code = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code - + "' and task_status <> '06'"; - if (StrUtil.isEmpty(vehicle_code)) { - where = "next_point_code = '" + wcsdevice_code + "' and task_status <> '06'"; - } - - JSONArray arr = instructTab.query(where).getResultJSONArray(0); - JSONArray result = new JSONArray(); - for (int i = 0; i < arr.size(); i++) { - JSONObject row = arr.getJSONObject(i); - JSONObject json = new JSONObject(); - json.put("instruct_uuid", row.getString("instruct_uuid")); - json.put("instructorder_no", row.getString("instructorder_no")); - json.put("wcsdevice_code", row.getString("next_point_code")); - json.put("start_point_code", row.getString("start_point_code")); - json.put("nextpoint_code", row.getString("next_point_code")); - json.put("nextpoint_code2", row.getString("next_point_code")); - result.add(json); - } - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map agvInBoxExceptionConfirm(Map jsonObject) { - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - String instruct_uuid = jsonObject.get("instruct_uuid"); - String extdevice_code = jsonObject.get("wcsdevice_code"); - String empty_vehicle_code = jsonObject.get("empty_vehicle_code"); - String full_vehicle_code = jsonObject.get("full_vehicle_code"); - // 缓存线位置表【ST_cacheLine_Position】 - WQLObject positionTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - JSONObject srb = new JSONObject(); - - /* - * JSONObject emptyObj = positionTab - * .query("is_active = '1' and is_delete = '0' and vehicle_code = '" + - * empty_vehicle_code + "'") .uniqueResult(0); - * - * // 判断箱子是否存在 if (emptyObj == null) { srb.setFailure(); srb.setDesc("条码【" + - * empty_vehicle_code + "】不存在，操作失败"); return srb; } JSONObject fullObj = - * positionTab .query("is_active = '1' and is_delete = '0' and vehicle_code = '" - * + full_vehicle_code + "'") .uniqueResult(0); // 判断箱子是否存在 if (fullObj == null) - * { srb.setFailure(); srb.setDesc("条码【" + full_vehicle_code + "】不存在，操作失败"); - * return srb; } - */ - - JSONObject instObj = instructTab.query("instruct_uuid = '" + instruct_uuid + "'").uniqueResult(0); - - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - WQLObject ivtTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - - // TODO: 2022/5/27 - /*AgvTwoInst inst = new AgvTwoInst(); - instObj.put("inboxtxm", full_vehicle_code); - instObj.put("outboxtxm", empty_vehicle_code); - inst.updateInstStatus(instObj, "1"); - inst.updateInstStatus(instObj, "2");*/ - - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map agvOutBoxExceptionQuery(Map jsonObject) { - String vehicle_code = jsonObject.get("vehicle_code"); - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - JSONObject srb = new JSONObject(); - JSONArray arr = new JSONArray(); - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - if (StrUtil.isEmpty(vehicle_code)) { - arr = instructTab.query("start_point_code = '" + wcsdevice_code + "' and task_status <> '06'") - .getResultJSONArray(0); - } else { - arr = instructTab.query("start_point_code = '" + wcsdevice_code + "' and vehicle_code = '" - + vehicle_code + "' and task_status <> '06'").getResultJSONArray(0); - } - - JSONArray result = new JSONArray(); - for (int i = 0; i < arr.size(); i++) { - JSONObject row = arr.getJSONObject(i); - JSONObject json = new JSONObject(); - json.put("instruct_uuid", row.getString("instruct_uuid")); - json.put("instructorder_no", row.getString("instructorder_no")); - json.put("wcsdevice_code", row.getString("start_point_code")); - json.put("vehicle_code", row.getString("outvehicle_code")); - json.put("start_point_code", row.getString("start_point_code")); - json.put("nextpoint_code", row.getString("next_point_code")); - json.put("nextpoint_code2", row.getString("next_point_code")); - result.add(json); - } - - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map agvOutBoxExceptionConfirm(Map jsonObject) { - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - String instruct_uuid = jsonObject.get("instruct_uuid"); - String vehicle_code = jsonObject.get("vehicle_code"); - String extdevice_code = jsonObject.get("wcsdevice_code"); - JSONObject instObj = instructTab.query("instruct_uuid = '" + instruct_uuid + "'").uniqueResult(0); - -// TODO: 2022/5/27 - /* AgvTwoInst inst = new AgvTwoInst(); - // 出箱的时候入箱码和出箱码相同 - instObj.put("inboxtxm", vehicle_code); - instObj.put("outboxtxm", vehicle_code); - inst.updateInstStatus(instObj, "1"); - inst.updateInstStatus(instObj, "2"); -*/ - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - } - - @Override - public Map cacheLineOutBoxExceptionQuery(Map jsonObject) { - String agv_no = jsonObject.get("agv_no"); - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - JSONArray arr = instructTab.query("(start_point_code = '" + wcsdevice_code + "' or next_point_code = '" - + wcsdevice_code + "') and task_status <> '06' and car_no like '%" + agv_no + "%'") - .getResultJSONArray(0); - JSONArray result = new JSONArray(); - for (int i = 0; i < arr.size(); i++) { - JSONObject row = arr.getJSONObject(i); - JSONObject json = new JSONObject(); - json.put("instruct_uuid", row.getString("instruct_uuid")); - json.put("instructorder_no", row.getString("instructorder_no")); - json.put("wcsdevice_code", row.getString("start_point_code")); - json.put("vehicle_code", "0"); - json.put("start_point_code", row.getString("start_point_code")); - json.put("nextpoint_code", row.getString("next_point_code")); - json.put("nextpoint_code2", row.getString("next_point_code")); - result.add(json); - } - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - } - - @Override - public Map cacheLineOutBoxExceptionConfirm(Map jsonObject) { - WQLObject instructTab = WQLObject.getWQLObject("sch_base_task"); - String instruct_uuid = jsonObject.get("instruct_uuid"); - JSONObject instObj = instructTab.query("instruct_uuid = '" + instruct_uuid + "'").uniqueResult(0); - if (instObj != null) { - instObj.put("task_type", "06"); - instObj.put("instructfinish_mode", "02"); - instObj.put("update_time", DateUtil.now()); - instObj.put("remark", "缓存线出箱异常确认完成!"); - instructTab.update(instObj); - // 把所以来该缓存线的AGV指令都完成掉 - if (instObj.getString("next_point_code").contains("HCX")) { - HashMap map = new HashMap<>(); - map.put("task_type", "06"); - map.put("instructfinish_mode", "02"); - map.put("update_time", DateUtil.now()); - map.put("remark", "缓存线出箱异常确认完成!"); - instructTab.update(map, "next_point_code = '" + instObj.getString("next_point_code") - + "' and task_type <> '06'"); - } - - // 把所以从该缓存线出AGV指令都完成掉 - if (instObj.getString("start_point_code").contains("HCX")) { - HashMap map = new HashMap<>(); - map.put("task_type", "06"); - map.put("instructfinish_mode", "02"); - map.put("update_time", DateUtil.now()); - map.put("remark", "缓存线出箱异常确认完成!"); - instructTab.update(map, "start_point_code = '" + instObj.getString("start_point_code") - + "' and task_type <> '06'"); - } - - // 得到异常的载具号 - String vehicle_codeStr = instObj.getString("vehicle_code"); - String[] arr = vehicle_codeStr.split(","); - // 缓存线载具物料表【IF_cacheLine_VehileMaterial】 - WQLObject ivtTab = WQLObject.getWQLObject("IF_cacheLine_VehileMaterial"); - for (String vehicle_code : arr) { - HashMap map = new HashMap<>(); - // 异常 - map.put("vehicle_status", "03"); - ivtTab.update(map, "vehicle_code = '" + vehicle_code + "'"); - } - } - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map materialQuery(Map jsonObject) { - HashMap map = new HashMap<>(); - map.put("flag", "6"); - map.put("searchBar", "%" + jsonObject.get("search_bar") + "%"); - JSONArray arr = WQL.getWO("QWCS_CACHE_004").addParamMap(map).process().getResultJSONArray(0); - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map setBlankPos(Map jsonObject) { - // 层数 - String layer_num = jsonObject.get("layer_num"); - // 顺序号 - String seat_order_num = jsonObject.get("seat_order_num"); - // 缓存线编码 - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - // 缓存线位置表【ST_cacheLine_Position】 - - WQLObject ivtTab = WQLObject.getWQLObject("ST_cacheLine_Position"); - JSONObject json = ivtTab.query("layer_num = " + layer_num + " and extdevice_code like '%" + wcsdevice_code - + "%' and order_no = " + seat_order_num + "").uniqueResult(0); - // 状态设置为空位 - json.put("is_blank", "1"); - json.put("vehicle_uuid", ""); - json.put("vehicle_code", ""); - ivtTab.update(json); - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map instStatusQuery(Map jsonObject) { - HashMap map = new HashMap<>(); - map.put("flag", "7"); - JSONArray arr = WQL.getWO("QWCS_CACHE_004").addParamMap(map).process().getResultJSONArray(0); - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("result", arr); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map cacheLineExcepOpt(Map jsonObject) { - // 缓存线编码 - String wcsdevice_code = jsonObject.get("wcsdevice_code"); - // 01-暂停、02-启动 - String opt_type = jsonObject.get("opt_type"); - System.out.println("操作类型:" + opt_type); - - Object[] objs = new Object[2]; - objs[0] = wcsdevice_code; - // 类型:恢复是0，暂停是1 - String type = "1"; - if ("02".equals(opt_type)) { - type = "0"; - } - objs[1] = type; - // TODO: 2022/5/27 - /*// 下发给wcs - uWcsSchedule.notifyWcs(99, 1000, objs);*/ - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map instOperation(Map jsonObject) { - return null; - } - - @Override - public Map pourMaterial(Map jsonObject) { - // 指令标识 - String instruct_uuid = jsonObject.get("instruct_uuid"); - // 指令点位表【sch_base_task】 - JSONObject instObj = WQLObject.getWQLObject("sch_base_task") - .query("instruct_uuid = '" + instruct_uuid + "'").uniqueResult(0); - int putquantity = instObj.getInteger("quantity"); - String producer = instObj.getString("next_point_code"); - Object[] objs = new Object[2]; - objs[0] = producer; - objs[1] = putquantity; - // TODO: 2022/5/27 - // 下发给wcs - /* uWcsSchedule.notifyWcs(99, 3002, objs);*/ - - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - - } - - @Override - public Map instPageQuery(Map jsonObject) { - String nPageStart = jsonObject.get("nPageStart"); - String nPageRecordNum = jsonObject.get("nPageRecordNum"); - String date_begin = jsonObject.get("start_date"); - String date_end = jsonObject.get("end_date"); - if (StrUtil.isEmpty(date_begin) || date_begin.equals("null")) { - date_begin = ""; - } - if (StrUtil.isEmpty(date_end) || date_end.equals("null")) { - date_end = ""; - } - HashMap map = new HashMap<>(); - map.put("agv_no", jsonObject.get("agv_num")); - map.put("instructoperate_num", jsonObject.get("inst_num")); - map.put("vehicle_code", jsonObject.get("vehicle_code")); - map.put("startwcsdevice_name", jsonObject.get("start_point")); - map.put("nextwcsdevice_name", jsonObject.get("end_point")); - map.put("date_begin", date_begin); - map.put("date_end", date_end); - - String sql = ""; - // 指令状态未完成 - if ("90".equals(jsonObject.get("status"))) { - sql = " inst.task_type <> '06' "; - } - if (StrUtil.isNotEmpty(jsonObject.get("status")) && !"90".equals(jsonObject.get("status"))) { - sql = " inst.task_type = '" + jsonObject.get("status") + "'"; - } - map.put("sql", sql); - // AGV双工 - map.put("instruct_type", "01"); - JSONObject param = new JSONObject(); - int page = Integer.valueOf(jsonObject.get("page")); - int size = Integer.valueOf(jsonObject.get("size")); - Pageable pageable = PageRequest.of(page - 1, size); - - - JSONObject result = WQL.getWO("QWMS_WCS7").addParamMap(map).pageQuery(WqlUtil.getHttpContext(pageable), ""); - JSONArray results = result.getJSONArray("rows"); - JSONObject srb = new JSONObject(); - srb.put("code", 1); - srb.put("desc", "操作成功！"); - return srb; - - - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/MateriorecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/MateriorecordServiceImpl.java deleted file mode 100644 index 9d4e675..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/MateriorecordServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package org.nl.wms.cacheline.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; -import org.nl.wms.cacheline.service.MateriorecordService; -import org.nl.wms.cacheline.service.dto.MateriorecordDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author qinx -* @date 2022-05-26 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class MateriorecordServiceImpl implements MateriorecordService { - - @Override - public Map queryAll(Map whereJson, Pageable page){ - HashMap map = new HashMap(); - map.put("flag","3"); - map.put("extdevice_code",whereJson.get("extdevice_code")); - map.put("search",whereJson.get("search")); - JSONObject jsonObject = WQL.getWO("cacheLine_VEHICLE_001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "vehicle_code"); - return jsonObject; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(MateriorecordDto.class); - return null; - } - - @Override - public MateriorecordDto findById(Long record_uuid) { - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - JSONObject json = wo.query("record_uuid = '" + record_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( MateriorecordDto.class); - } - return null; - } - - @Override - public MateriorecordDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( MateriorecordDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(MateriorecordDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - dto.setRecord_uuid(IdUtil.getSnowflake(1, 1).nextId()); - dto.setUpdate_time(now); - dto.setCreate_time(now); - String extdevice_code =dto.getExtdevice_code(); - JSONObject postionObj = WQLObject.getWQLObject("ST_cacheLine_Position").query("extdevice_code='" + extdevice_code + "'").uniqueResult(0); - Long device_uuid = Long.valueOf(postionObj.getString("device_uuid")); - String device_name = postionObj.getString("device_name"); - dto.setDevice_uuid(device_uuid); - dto.setDevice_name(device_name); - - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MateriorecordDto dto) { - MateriorecordDto entity = this.findById(dto.getRecord_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String extdevice_code =dto.getExtdevice_code(); - JSONObject postionObj = WQLObject.getWQLObject("ST_cacheLine_Position").query("extdevice_code='" + extdevice_code + "'").uniqueResult(0); - Long device_uuid = Long.valueOf(postionObj.getString("device_uuid")); - String device_name = postionObj.getString("device_name"); - dto.setDevice_uuid(device_uuid); - dto.setDevice_name(device_name); - String now = DateUtil.now(); - dto.setUpdate_time(now); - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_materiorecord"); - for (Long record_uuid: ids) { - JSONObject param = new JSONObject(); - param.put("record_uuid", String.valueOf(record_uuid)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehicleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehicleServiceImpl.java deleted file mode 100644 index f07bfad..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehicleServiceImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -package org.nl.wms.cacheline.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; -import org.nl.wms.cacheline.service.VehicleService; -import org.nl.wms.cacheline.service.dto.VehicleDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author qinx - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class VehicleServiceImpl implements VehicleService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap(); - map.put("flag","1"); - map.put("search",whereJson.get("search")); - JSONObject jsonObject = WQL.getWO("cacheLine_VEHICLE_001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "vehicle_code"); - return jsonObject; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(VehicleDto.class); - return null; - } - - @Override - public VehicleDto findById(Long vehicle_uuid) { - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - JSONObject json = wo.query("vehicle_uuid = '" + vehicle_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(VehicleDto.class); - } - return null; - } - - @Override - public VehicleDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(VehicleDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(VehicleDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - String vehicle_code = dto.getVehicle_code(); - JSONObject vehicleObj = WQLObject.getWQLObject("st_cacheLine_vehicle").query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(vehicleObj)) { - throw new BadRequestException("载具编码为'" + vehicle_code + "'已经存在！"); - } - dto.setVehicle_uuid(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(VehicleDto dto) { - VehicleDto entity = this.findById(dto.getVehicle_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String vehicle_code = dto.getVehicle_code(); - JSONObject vehicleObj = WQLObject.getWQLObject("st_cacheLine_vehicle").query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(vehicleObj)) { - throw new BadRequestException("载具编码为'" + vehicle_code + "'已经存在！"); - } - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_cacheLine_vehicle"); - for (Long vehicle_uuid : ids) { - JSONObject param = new JSONObject(); - param.put("vehicle_uuid", String.valueOf(vehicle_uuid)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - String is_active = "1"; - if (StrUtil.equals("1", json.getString("is_active"))) { - is_active = "0"; - } - json.put("is_active", is_active); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_cacheLine_vehicle").update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changePrint(JSONObject json) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - String is_print = "1"; - if (StrUtil.equals("1", json.getString("is_print"))) { - is_print = "0"; - } - json.put("is_print", is_print); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("st_cacheLine_vehicle").update(json); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehilematerialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehilematerialServiceImpl.java deleted file mode 100644 index ba415f2..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/service/impl/VehilematerialServiceImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -package org.nl.wms.cacheline.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; - -import org.nl.wms.cacheline.service.VehilematerialService; -import org.nl.wms.cacheline.service.dto.VehilematerialDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author qinx - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class VehilematerialServiceImpl implements VehilematerialService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap(); - map.put("extdevice_code", whereJson.get("extdevice_code")); - map.put("flag", "4"); - map.put("search", whereJson.get("search")); - JSONObject jsonObject = WQL.getWO("cacheLine_VEHICLE_001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "extdevice_code,position_code"); - return jsonObject; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(VehilematerialDto.class); - return null; - } - - @Override - public VehilematerialDto findById(Long vehmaterial_uuid) { - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - JSONObject json = wo.query("vehmaterial_uuid = '" + vehmaterial_uuid + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(VehilematerialDto.class); - } - return null; - } - - @Override - public VehilematerialDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(VehilematerialDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(VehilematerialDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - dto.setVehmaterial_uuid(IdUtil.getSnowflake(1, 1).nextId()); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(VehilematerialDto dto) { - Long vehmaterial_uuid = dto.getVehmaterial_uuid(); - Long vehicle_uuid = dto.getVehicle_uuid(); - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - //假如有记录则更新 没记录则插入 - if (vehmaterial_uuid != null && StrUtil.isNotEmpty(String.valueOf(vehmaterial_uuid))) { - VehilematerialDto entity = this.findById(dto.getVehmaterial_uuid()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - dto.setUpdate_time(now); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - //假如载具为空则删除 - if (vehicle_uuid != null && StrUtil.isNotEmpty(String.valueOf(vehicle_uuid))) { - wo.delete(json); - } - wo.update(json); - } else { - //插入之前 删除该位置托盘的物料的记录 - if (vehicle_uuid != null && StrUtil.isNotEmpty(String.valueOf(vehicle_uuid))) { - wo.delete("vehicle_uuid='"+vehicle_uuid+"'"); - } - this.create(dto); - } - - //更新缓存线位置表 - Long position_uuid = dto.getPosition_uuid(); - String vehicle_code = dto.getVehicle_code(); - JSONObject postionObj = WQLObject.getWQLObject("ST_cacheLine_Position").query("position_uuid='" + position_uuid + "'").uniqueResult(0); - postionObj.put("vehicle_code", vehicle_code); - postionObj.put("vehicle_uuid", vehicle_uuid); - WQLObject.getWQLObject("ST_cacheLine_Position").update(postionObj); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("if_cacheLine_vehilematerial"); - for (Long vehmaterial_uuid : ids) { - JSONObject param = new JSONObject(); - param.put("vehmaterial_uuid", String.valueOf(vehmaterial_uuid)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/CACHELINE_VEHICLE_001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/CACHELINE_VEHICLE_001.wql deleted file mode 100644 index dccb620..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/CACHELINE_VEHICLE_001.wql +++ /dev/null @@ -1,174 +0,0 @@ -[交易说明] - 交易名： 载具扩展属性设置分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.extdevice_code TYPEAS s_string - - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - * - FROM - st_cacheline_vehicle vehicle - WHERE - 1=1 - OPTION 输入.search <> "" - vehicle.vehicle_code like "%" 输入.search "%" - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - PAGEQUERY - SELECT - position.position_uuid, - position.position_code, - position.position_name, - position.positionOrder_no, - position.device_uuid, - position.extdevice_code, - position.device_name, - position.layer_num, - position.priority_layer_no, - position.order_no, - position.vehicle_uuid, - position.vehicle_code, - vehicle.vehmaterial_uuid, - vehicle.vehicle_status, - vehicle.err_type, - vehicle.produceorder_uuid, - vehicle.produceorder_code, - vehicle.workprocedure_uuid, - vehicle.workprocedure_code, - vehicle.workprocedure_name, - vehicle.material_uuid, - vehicle.quantity, - vehicle.weight, - vehicle.create_time, - vehicle.update_time - FROM - st_cacheline_position position - LEFT JOIN IF_CacheLine_VehileMaterial vehicle ON vehicle.vehicle_uuid = position.vehicle_uuid - where - 1=1 - OPTION 输入.search <> "" - ( position.position_name like "%" 输入.search "%" - or position.position_code like "%" 输入.search "%" - ) - ENDOPTION - OPTION 输入.extdevice_code <> "" - position.extdevice_code = 输入.extdevice_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "3" - PAGEQUERY - SELECT - record.*, - material.material_id, - material.material_code, - material.material_name, - material.material_spec, - workprocedure.workprocedure_id, - workprocedure.workprocedure_code, - workprocedure.workprocedure_name - FROM - IF_CacheLine_MaterIORecord record - LEFT JOIN md_me_materialbase material ON material.material_id = record.material_uuid - LEFT JOIN pdm_bi_workprocedure workprocedure ON workprocedure.workprocedure_id = record.workprocedure_uuid - WHERE - 1 =1 - OPTION 输入.search <> "" - record.vehicle_code like "%" 输入.search "%" - ENDOPTION - OPTION 输入.extdevice_code <> "" - cacheLine.extdevice_code = 输入.extdevice_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "4" - PAGEQUERY - SELECT - position.position_uuid, - position.position_code, - position.position_name, - position.positionOrder_no, - position.device_uuid, - position.extdevice_code, - position.device_name, - position.layer_num, - position.priority_layer_no, - position.order_no, - position.vehicle_uuid, - position.vehicle_code, - vehicle.vehmaterial_uuid, - vehicle.vehicle_status, - vehicle.err_type, - vehicle.produceorder_uuid, - vehicle.produceorder_code, - vehicle.workprocedure_uuid, - vehicle.workprocedure_code, - vehicle.workprocedure_name, - vehicle.material_uuid, - vehicle.quantity, - vehicle.weight, - vehicle.create_time, - vehicle.update_time - FROM - st_cacheline_position position - LEFT JOIN IF_CacheLine_VehileMaterial vehicle ON vehicle.vehicle_uuid = position.vehicle_uuid - where - 1=1 - OPTION 输入.search <> "" - ( position.position_name like "%" 输入.search "%" - or position.position_code like "%" 输入.search "%" - ) - ENDOPTION - OPTION 输入.extdevice_code <> "" - position.extdevice_code = 输入.extdevice_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF \ No newline at end of file diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QACS_CACHE_005.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QACS_CACHE_005.wql deleted file mode 100644 index 2dcb923..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QACS_CACHE_005.wql +++ /dev/null @@ -1,74 +0,0 @@ -[交易说明] - 交易名： Acs交互 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.produceorder_uuid TYPEAS s_string - 输入.material_uuid TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - -IF 输入.flag = "1" - QUERY - SELECT - * - FROM - ST_CacheLine_Position position - LEFT JOIN IF_CacheLine_VehileMaterial vehicle ON position.vehicle_uuid = vehicle.vehicle_uuid - WHERE - vehicle.vehicle_status = '01' - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "2" - QUERY - SELECT - * - FROM - ST_CacheLine_Position position - LEFT JOIN IF_CacheLine_VehileMaterial vehicle ON position.vehicle_uuid = vehicle.vehicle_uuid - WHERE - vehicle.vehicle_status = '02' - OPTION 输入.produceorder_uuid <> "" - vehicle.produceorder_uuid=输入.produceorder_uuid - ENDOPTION - OPTION 输入.material_uuid <> "" - vehicle.material_uuid=输入.material_uuid - ENDOPTION - ENDSELECT - ENDQUERY -ENDIF - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QWCS_CACHE_004.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QWCS_CACHE_004.wql deleted file mode 100644 index e6f9081..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/wql/QWCS_CACHE_004.wql +++ /dev/null @@ -1,194 +0,0 @@ -[交易说明] - 交易名： 查找缺料的生产中的设备 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.extdevice_code TYPEAS s_string - 输入.searchBar TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - -IF 输入.flag = "1" - QUERY - SELECT - material_spec as label , - material_spec as value - FROM - md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id - LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id - WHERE - mb.is_delete = '0' - AND 1 = 1 - AND class.class_id IN ( '1528555445302726656', '1528555443906023424', '1528555445080428544' ) - GROUP BY - material_spec - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "2" - QUERY - SELECT - workprocedure_code as value, - workprocedure_name as label - FROM - PDM_BI_WorkProcedure - WHERE 1=1 - Order BY - workprocedure_code, - workprocedure_name - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "3" - QUERY - SELECT - device_uuid, - extdevice_code AS wcsdevice_code, - device_name, - vehicle_code, - workprocedure_uuid, - workprocedure_code, - workprocedure_name, - material_uuid, - material_code, - material_name, - material_spec, - quantity, - weight, - layer_num, - order_no AS seat_order_num, - vehicle_status as status, - err_type - FROM - IF_CacheLine_Ivt - where 1=1 - OPTION 输入.extdevice_code <> "" - extdevice_code=输入.extdevice_code - ENDOPTION - order by layer_num desc,order_no - ENDSELECT - ENDQUERY -ENDIF - - -IF 输入.flag = "4" - QUERY - SELECT - semimanufactures_uuid AS material_uuid, - semimanufactures_code AS material_code, - semimanufactures_name AS material_name, - semimanufactures_spec AS material_spec, - p.sysdic_name AS deviceprocess_seriesname - FROM - PDM_BI_WorkshopMaterialCorr c - LEFT JOIN PF_PB_SysDicInfo p ON c.materialprocess_series = p.sysdic_code AND p.sysdic_type = 'IF_WCS_DEVICESERIES' - where 1=1 - OPTION 输入.searchBar <> "" - ( c.semimanufactures_code LIKE 输入.searchBar or c.semimanufactures_code LIKE 输入.searchBar or - c.semimanufactures_code LIKE 输入.searchBar ) - ENDOPTION - GROUP BY - semimanufactures_uuid, - semimanufactures_code, - semimanufactures_name, - semimanufactures_spec, - p.sysdic_name - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "5" - QUERY - SELECT - cacheline.device_uuid, - cacheline.extdevice_code as wcsdevice_code, - cacheline.device_name - FROM - st_cacheline_position cacheline - WHERE - 1 = 1 - - GROUP BY - device_uuid, - device_uuid, - extdevice_code - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "6" - QUERY - SELECT - mb.material_id, - mb.material_code, - mb.material_name, - mb.material_spec, - class_code, - class_name deviceprocess_seriesname - FROM - md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id - WHERE - mb.is_delete = '0' - AND 1 = 1 - AND class.class_id IN ( '1528555445302726656', '1528555443906023424', '1528555445080428544' ) - OPTION 输入.searchBar <> "" - ( mb.material_code LIKE 输入.searchBar or mb.material_name LIKE 输入.searchBar ) - ENDOPTION - GROUP BY - material_spec - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "7" - QUERY - SELECT - det.`value` as value, - det.label as label - FROM - sys_dict dict - LEFT JOIN sys_dict_detail det ON det.dict_id = dict.dict_id - WHERE - 1 = 1 - AND dict.`name` = 'task_status' - GROUP BY - material_spec - ENDSELECT - ENDQUERY -ENDIF \ No newline at end of file diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java deleted file mode 100644 index d689b2e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/autoTask/AutoAgvStatus.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.nl.wms.ext.bigScreen.autoTask; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.extern.slf4j.Slf4j; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.stereotype.Component; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -@Slf4j -@Component -public class AutoAgvStatus { - - @Autowired - private MongoTemplate mongoTemplate; - - public void run() { - - WQLObject agv_status = WQLObject.getWQLObject("DS_AGV_AgvStatus"); - WQLObject agv_point = WQLObject.getWQLObject("DS_AGV_PointCoordinateRelate"); - - for (int i = 1; i <= 7; i++) { - String device_code = String.valueOf(i); - - Query query = new Query(); - query.addCriteria(Criteria.where("device_code").is(device_code)); - List avg_all = mongoTemplate.find(query, JSONObject.class, "agv_test"); - - JSONObject jsonAgv = agv_status.query("agv_code = '" + device_code + "'").uniqueResult(0); - String real_x_coor = ""; - String real_y_coor = ""; - for (JSONObject json : avg_all) { - String key = json.getString("key"); - - switch (key) { - case "pic_name" : - jsonAgv.put("pic_name",json.getString("value")); - break; - case "agv_power" : - jsonAgv.put("agv_power",json.getString("value")); - break; - case "agv_stateType" : - jsonAgv.put("agv_statetype",json.getString("value")); - break; - case "x_coordinate" : - String value = NumberUtil.div(json.getString("value"), "100").toString(); - real_x_coor = NumberUtil.round(value, 0).toString(); - break; - case "y_coordinate" : - String value2 = NumberUtil.div(json.getString("value"), "100").toString(); - real_y_coor = NumberUtil.round(value2, 0).toString(); - break; - case "error_status" : - jsonAgv.put("error_status",json.getString("value")); - break; - case "error_info" : - jsonAgv.put("error_info",json.getString("value")); - break; - case "direction_type" : - jsonAgv.put("direction_type",json.getString("value")); - break; - } - } - JSONObject jsonPoint = agv_point.query("real_x_coor = '" + real_x_coor + "' and real_y_coor = '" + real_y_coor + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonPoint)) { - jsonAgv.put("x_coordinate", jsonPoint.getString("web_x_coor")); - jsonAgv.put("y_coordinate", jsonPoint.getString("web_y_coor")); - } - jsonAgv.put("update_datetime", DateUtil.now()); - agv_status.update(jsonAgv); - } - } - - public static void main(String[] args) { - - ArrayList objects = new ArrayList<>(); - objects.add(null); - LinkedList objects1 = new LinkedList<>(); - objects1.add(4); - objects1.add(4.4); - objects1.add(null); - - ArrayDeque objects2 = new ArrayDeque<>(); - System.out.println(objects1); - } -} 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 deleted file mode 100644 index d475c58..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.nl.wms.ext.bigScreen.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.ext.bigScreen.service.AgvBigScreenService; -import org.nl.wms.ext.bigScreen.service.BigScreenService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author liuxy - * @date 2022-07-27 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "AGV监控中心") -@RequestMapping("/api/agvBigScreen") -@Slf4j -@CrossOrigin -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 deleted file mode 100644 index 1fd068e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.nl.wms.ext.bigScreen.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.ext.bigScreen.service.BigScreenService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author ludj - * @date 2021-07-21 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "监控大屏") -@RequestMapping("/api/bigScreenScreen") -@Slf4j -@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); - } - - - @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); - return new ResponseEntity<>( HttpStatus.OK); - } - - - @PutMapping("/edit") - @Log("手动修改监控大屏数据") - @ApiOperation("手动修改监控大屏数据") - public ResponseEntity edit(@RequestBody JSONObject param) throws Exception { - bigScreenService.edit(param); - return new ResponseEntity<>( HttpStatus.OK); - } - - @DeleteMapping("/del") - @Log("手动删除监控大屏数据") - @ApiOperation("手动删除监控大屏数据") - public ResponseEntity del(@RequestBody Long[] ids) throws Exception { - bigScreenService.del(ids); - return new ResponseEntity<>( HttpStatus.OK); - } -} 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 deleted file mode 100644 index a636c0b..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.nl.wms.ext.bigScreen.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.ext.bigScreen.service.DeviceScreenService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Api(tags = "设备监控大屏") -@RequestMapping("/api/deviceScreen") -@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 deleted file mode 100644 index ed17cf3..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java +++ /dev/null @@ -1,84 +0,0 @@ - -package org.nl.wms.ext.bigScreen.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; - -import org.nl.wms.ext.bigScreen.service.ProductService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @author ldjun - * @date 2021-07-26 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "大屏生产监控中心") -@RequestMapping("/api/bigscreen/product") -@Slf4j -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天产量走势") - 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/bigScreen/service/AgvBigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/AgvBigScreenService.java deleted file mode 100644 index 10e8dff..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/AgvBigScreenService.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.wms.ext.bigScreen.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -public interface AgvBigScreenService { - - JSONObject getTask(JSONObject whereJson); - - JSONObject getAgvMsg(JSONObject whereJson); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java deleted file mode 100644 index 5844b89..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.nl.wms.ext.bigScreen.service; - -import com.alibaba.fastjson.JSONObject; -import org.springframework.data.domain.Pageable; - -import java.util.Map; - -/** - * 中控室大屏看板 - */ -public interface BigScreenService { - /** - * 获取监控大屏数据页面 - * - * @return - */ - public JSONObject getData(JSONObject param); - - /** - * 三维动画页面 - * - * @return - */ - public JSONObject query3Dcartoon(JSONObject param); - - /** - * 获根据不同看板编号查询不同工序看板数据 - * - * @return - */ - public JSONObject workScreen(JSONObject param); - - /** - * 获取监控大屏静态设置的数据数据页面 - * - * @return - */ - public Map queryInfo(Map whereJson, Pageable page); - - /** - * 手动添加监控大屏数据 - * @param param - */ - public void add(JSONObject param) throws Exception; - - /** - * 手动修改监控大屏数据 - * @param param - */ - public void edit(JSONObject param) throws Exception; - - /** - * 手动删除监控大屏数据 - * @param ids - */ - public void del(Long[] ids) throws Exception; - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java deleted file mode 100644 index d8254e8..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.nl.wms.ext.bigScreen.service; - -import com.alibaba.fastjson.JSONObject; - -public interface DeviceScreenService { - public JSONObject deviceStatus(JSONObject param); - - public JSONObject oeeAndTeep(JSONObject param); - - public JSONObject queryDeviceByWork(JSONObject param); - - public JSONObject deviceErrorNum(JSONObject param); - - public JSONObject deviceManage(JSONObject param); - - public JSONObject deviceCensus(JSONObject param); - - public JSONObject deviceErrorInfo(JSONObject param); - - public JSONObject deviceUseRate(JSONObject param); - - public JSONObject deviceStatusList(JSONObject param); - - public JSONObject errCensus(JSONObject param); -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java deleted file mode 100644 index 4053082..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.nl.wms.ext.bigScreen.service; - -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.Map; - -@Service -public interface ProductService { - /** - * 计划达成 - * @param param 条件 - * @return Map - * - */ - Map planReached(@RequestBody Map param); - /** - * 今日排产生产进度跟踪 - * @param param 条件 - * @return Map - * - */ - Map productSchedule(@RequestBody Map param); - /** - * 今日产量 - * @param param 条件 - * @return Map - * - */ - Map output(@RequestBody Map param); - /** - * 近一周工段产量 - * @param param 条件 - * @return Map - * - */ - Map worksectionHarvest(@RequestBody Map param); - /** - * 今日Top10产量 - * @param param 条件 - * @return Map - * - */ - Map topHarvest(@RequestBody Map param); - /** - * 30天产量走势 - * @param param 条件 - * @return Map - * - */ - Map monthHarvest(@RequestBody Map param); - /** - * 今日未完成订单 - * @param param 条件 - * @return Map - * - */ - Map unfinishOrder(@RequestBody Map param); - /** - * 30天生产订单分布 - * @param param 条件 - * @return Map - * - */ - Map monthOrder(@RequestBody Map param); - - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java deleted file mode 100644 index d5abb11..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.dto; - -import lombok.Data; -import java.math.BigDecimal; -import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @description / - * @author geng by - * @date 2022-07-14 - **/ -@Data -public class ShopinfoDto implements Serializable { - - /** 标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long shop_id; - - /** 今日计划量(pcs) */ - private BigDecimal production_plan1; - - /** 今日计划量(吨) */ - private BigDecimal production_plan2; - - /** 今日入库数(吨) */ - private BigDecimal today_in2; - - /** 今日入库数(pcs) */ - private BigDecimal today_in1; - - /** 车间原材料数(吨) */ - private BigDecimal materials_num; - - /** 今日出库数(吨) */ - private BigDecimal today_out2; - - /** 今日出库数(pcs) */ - private BigDecimal today_out1; - - /** 昨日入库数(吨) */ - private BigDecimal yesterday_in2; - - /** 昨日入库数(pcs) */ - private BigDecimal yesterday_in1; - - /** 昨日出库数(吨) */ - private BigDecimal yesterday_out2; - - /** 昨日出库数(pcs) */ - private BigDecimal yesterday_out1; - - /** 车间人数 */ - private BigDecimal person_num; - - /** 车间成品数(吨) */ - private BigDecimal product_num2; - - /** 车间成品数(pcs) */ - private BigDecimal product_num1; - - /** 车间在制品数(吨) */ - private BigDecimal processed_num2; - - /** 车间在制品数(pcs) */ - private BigDecimal processed_num1; - - /** 车间工艺路线数 */ - private BigDecimal route_num; - - /** 车间设备数 */ - private BigDecimal device_num; - - /** 今日生产量(pcs) */ - private BigDecimal production_today1; - - /** 今日生产量(吨) */ - private BigDecimal production_today2; - - /** 完成率 */ - private BigDecimal completion_rate; - - /** 更新时间 */ - private String b_date; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java deleted file mode 100644 index 13f4b5d..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.dto; - -import lombok.Data; -import java.math.BigDecimal; -import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @description / - * @author geng by - * @date 2022-07-14 - **/ -@Data -public class StockDto implements Serializable { - - /** 标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long id; - - /** 日期 */ - private String date; - - /** 不足的 */ - private BigDecimal not_enough; - - /** 库容量 */ - private BigDecimal storagecapacity_weight; - - /** 库存量 */ - private BigDecimal repertory; - - /** 足够的 */ - private BigDecimal enough; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java deleted file mode 100644 index e26118e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.dto; - -import lombok.Data; -import java.math.BigDecimal; -import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @description / - * @author geng by - * @date 2022-07-14 - **/ -@Data -public class SupplyDto implements Serializable { - - /** 标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long id; - - /** 日期 */ - private String date; - - /** 不足的 */ - private BigDecimal not_enough; - - /** 供 */ - private BigDecimal planinventory_weight; - - /** 需 */ - private BigDecimal need_num; - - /** 足够的 */ - private BigDecimal enough; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java deleted file mode 100644 index 05544e4..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.dto; - -import lombok.Data; -import java.math.BigDecimal; -import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @description / - * @author geng by - * @date 2022-07-14 - **/ -@Data -public class TodayandplannumDto implements Serializable { - - /** 标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long pro_id; - - /** 今日产量 */ - private BigDecimal num_today; - - /** 今日产品名称 */ - private String name_today; - - /** 计划数量 */ - private BigDecimal num_plan; - - private BigDecimal isBigZero = new BigDecimal(0); -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java deleted file mode 100644 index 1cc198e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.dto; - -import lombok.Data; -import java.math.BigDecimal; -import java.io.Serializable; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - -/** - * @description / - * @author geng by - * @date 2022-07-14 - **/ -@Data -public class YearinoutDto implements Serializable { - - /** 标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long id; - - /** 车道工序数 */ - private BigDecimal process_num; - - /** 生产规格数 */ - private BigDecimal product_num; - - /** 总设计年产量(pcs) */ - private BigDecimal total_input1; - - /** 总设计年产量(吨) */ - private BigDecimal total_input2; - - /** 一期设计年产量(pcs) */ - private BigDecimal year_output1; - - /** 一期设计年产量(吨) */ - private BigDecimal year_output2; - - /** 日期 */ - private String b_date; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java deleted file mode 100644 index adb6af2..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.impl; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.MongoClient; -import com.mongodb.client.MongoDatabase; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.AgvBigScreenService; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; - -@Service -@RequiredArgsConstructor -@Slf4j -public class AgvBigScreenServiceImpl implements AgvBigScreenService { - - @Override - public JSONObject getTask(JSONObject whereJson) { - JSONObject result = new JSONObject(); - try { - JSONObject param = new JSONObject(); - // 1.获取总任务数 - String today = DateUtil.today(); - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("today", "%"+today+"%"); - JSONObject jsonAll = WQL.getWO("AGVBIGSCREEN01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonAll)) { - param.put("all_task_number",jsonAll.getString("all_task_number")); - } else { - param.put("all_task_number","0"); - } - - // 2.获取已执行任务数 状态 = 99 - map.put("flag", "2"); - JSONObject jsonFinish = WQL.getWO("AGVBIGSCREEN01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonFinish)) { - param.put("finish_task_number",jsonFinish.getString("finish_task_number")); - } else { - param.put("finish_task_number","0"); - } - - // 3.获取取消的任务数 是否删除 = 1 - map.put("flag", "3"); - JSONObject jsonCancel = WQL.getWO("AGVBIGSCREEN01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonCancel)) { - param.put("cancel_task_number",jsonCancel.getString("cancel_task_number")); - } else { - param.put("cancel_task_number","0"); - } - - // 4.获取未执行任务数 状态 <> 99 - map.put("flag", "4"); - JSONObject jsonNotFinish = WQL.getWO("AGVBIGSCREEN01").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonNotFinish)) { - param.put("not_finish_task_number",jsonNotFinish.getString("not_finish_task_number")); - } else { - param.put("not_finish_task_number","0"); - } - - result.put("code", "1"); - result.put("desc", "查询成功"); - result.put("srb", param); - } catch (Exception e) { - result.put("code", "0"); - result.put("desc", "查询失败:"+e.getMessage()); - } - return result; - } - - @Override - public JSONObject getAgvMsg(JSONObject whereJson) { - JSONObject result = new JSONObject(); - try { - WQLObject agvTab = WQLObject.getWQLObject("DS_AGV_AgvStatus"); - JSONObject srb = new JSONObject(); - JSONArray errorArr = new JSONArray(); - - JSONArray agv_info = new JSONArray(); - for (int i = 1; i <= 7; i++) { - JSONObject json = new JSONObject(); - String agv_code = String.valueOf(i); - JSONObject jsonAgv = agvTab.query("agv_code = '" + agv_code + "'").uniqueResult(0); - // 1.车号 - json.put("agv_code", agv_code); - // 2.任务: 0为无任务、1为有任务 - json.put("agv_statetype", jsonAgv.getString("agv_statetype")); - // 3.电量 - json.put("agv_power", jsonAgv.getString("agv_power")); - // 4.预警： 0为正常，1为报警 - String error_status = jsonAgv.getString("error_status"); - if (StrUtil.equals(error_status,"1")) { - // 只要有一辆车有报警信息 状态则为1 - srb.put("error_status", "1"); - // 5.预警信息 - errorArr.add(jsonAgv.getString("error_info")); - } - // 6.agv名称 - json.put("agv_name", jsonAgv.getString("agv_name")); - // 7.x坐标 - json.put("x_coordinate", jsonAgv.getString("x_coordinate")); - // 8.y坐标 - json.put("y_coordinate", jsonAgv.getString("y_coordinate")); - // 9.方向类型 - json.put("direction_type", jsonAgv.getString("direction_type")); - - agv_info.add(json); - } - srb.put("agv_info_arr", agv_info); - srb.put("agv_error_arr", errorArr); - - result.put("srb", srb); - result.put("code", "1"); - result.put("desc", "查询成功"); - } catch (Exception e) { - result.put("code", "0"); - result.put("desc", "查询失败:"+e.getMessage()); - } - return result; - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java deleted file mode 100644 index 97f3386..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java +++ /dev/null @@ -1,307 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.impl; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.MapUtils; -import org.nl.start.auto.initial.ApplicationAutoInitial; -import org.nl.wms.ext.bigScreen.service.BigScreenService; -import org.nl.wms.ext.bigScreen.service.dto.*; -import org.nl.wql.core.bean.ResultBean; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.*; - -@Service -@RequiredArgsConstructor -@Slf4j -public class BigScreenServiceImpl implements BigScreenService, ApplicationAutoInitial { - List todayandplannumDtos = new ArrayList<>(); - YearinoutDto yearinoutDtos = new YearinoutDto(); - List supplyDtos = new ArrayList<>(); - List stockDtos = new ArrayList<>(); - ShopinfoDto shopinfoDtos = new ShopinfoDto(); - @Override - public JSONObject getData(JSONObject param) { - Integer todayPcsSum = 0; - Integer planPcsSum = 0; - JSONObject map = new JSONObject(); - Random random = new Random(); - for (int i = 0; i < todayandplannumDtos.size(); i++) { - TodayandplannumDto todayandplannumDto = todayandplannumDtos.get(i); - int compareTo = todayandplannumDto.getNum_plan().compareTo(BigDecimal.ZERO); - if (compareTo != 0) { - BigDecimal num_plan = todayandplannumDto.getNum_plan(); - BigDecimal everyPro = num_plan.divide(new BigDecimal(12 * 60 * 12),4, BigDecimal.ROUND_HALF_UP); - int compare = todayandplannumDto.getIsBigZero().compareTo(new BigDecimal(1)); - int compare1 = everyPro.compareTo(new BigDecimal(1)); - if (compare1 != -1){ - todayandplannumDto.setNum_today(todayandplannumDto.getNum_today().add(everyPro).setScale(0,BigDecimal.ROUND_DOWN)); - } else { - if (compare == -1){ - todayandplannumDto.setIsBigZero(todayandplannumDto.getIsBigZero().add(everyPro)); - } else { - todayandplannumDto.setNum_today(todayandplannumDto.getNum_today().add(todayandplannumDto.getIsBigZero()).setScale(0,BigDecimal.ROUND_DOWN)); - todayandplannumDto.setIsBigZero(new BigDecimal(0)); - } - } - } - todayPcsSum += Integer.parseInt(todayandplannumDto.getNum_today().toString()); - planPcsSum += Integer.parseInt(todayandplannumDto.getNum_plan().toString()); - } - map.put("production", todayandplannumDtos); - shopinfoDtos.setProduction_today1(BigDecimal.valueOf(todayPcsSum)); - shopinfoDtos.setProduction_plan1(BigDecimal.valueOf(planPcsSum)); - shopinfoDtos.setCompletion_rate(shopinfoDtos.getProduction_today1().divide(shopinfoDtos.getProduction_plan1(), 4, BigDecimal.ROUND_HALF_UP).movePointRight(2)); - map.put("shopData", shopinfoDtos); - Object[] objects = stockDtos.toArray(); - JSONObject st = new JSONObject(); - st.put("xDate", objects); - Object[] objects1 = supplyDtos.toArray(); - JSONObject su = new JSONObject(); - su.put("xDate", objects1); - map.put("data_bar2", st); - map.put("data_bar1", su); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", map); - return returnjo; - } - - @Override - public JSONObject query3Dcartoon(JSONObject param) { - //String str="{\"desc\":\"查询成功\",\"code\":\"1\",\"result\":{\"total_input1\":\"17500.00\",\"total_input2\":\"3500.00\",\"year_output1\":\"25000.00\",\"year_output2\":\"5000.00\",\"product_num\":\"205\",\"process_num\":\"8\",\"b_date\":\"2019-05-05\"}}"; - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", yearinoutDtos); - return returnjo; - } - - @Override - public JSONObject workScreen(JSONObject param) { - String web_flag = param.getString("web_flag"); - String str = ""; - //1车间下料看板 - if ("1".equals(web_flag)) { - str = "{\"code\":\"1\",\"desc\":\"查询成功\",\"result\":{\"screenname\":\"车间下料看板\",\"arr1\":[{\"workprocedure_name\":\"盘管双斜口下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"5\",\"device_num\":\"5\"},{\"workprocedure_name\":\"直管双斜口下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"1\",\"device_num\":\"1\"},{\"workprocedure_name\":\"盘管无屑下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"1\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"3\",\"device_num\":\"4\"},{\"workprocedure_name\":\"直管无屑下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"1\",\"device_num\":\"1\"}],\"arr2\":[{\"produceschedule_date\":\"2021-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"推弯一体机加工\",\"sysdic_name\":\"弯头工段\",\"worksection_type_scode\":\"01\",\"finishproduce_qty\":\"0\",\"produce_qty\":\"4200\",\"waiting_qty\":\"4200\",\"progress_qty\":\"0\"},{\"produceschedule_date\":\"2020-09-16\",\"produceorder_code\":\"0916014\",\"workprocedure_name\":\"盘管无屑下料\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"3500\",\"produce_qty\":\"3500\",\"waiting_qty\":\"0\",\"progress_qty\":\"100\"},{\"produceschedule_date\":\"2020-12-31\",\"produceorder_code\":\"1231013\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"790\",\"produce_qty\":\"3500\",\"waiting_qty\":\"2710\",\"progress_qty\":\"23\"},{\"produceschedule_date\":\"2020-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"4225\",\"produce_qty\":\"6000\",\"waiting_qty\":\"1775\",\"progress_qty\":\"70\"}],\"jo3\":{\"sumproduce_qty\":\"0\",\"sumfinishproduce_qty\":\"0\",\"sumproducing_qty\":\"0\",\"sumweek_qty\":\"0\"},\"arr4\":[{\"device_name\":\"L28\",\"devicestatus_name\":\"急停报警\",\"update_date\":\" 00:00:30\"},{\"device_name\":\"1-L22\",\"devicestatus_name\":\"急停报警\",\"update_date\":\" 00:00:24\"},{\"device_name\":\"L22-2\",\"devicestatus_name\":\"急停报警\",\"update_date\":\" 00:00:21\"},{\"device_name\":\"L22-1\",\"devicestatus_name\":\"急停报警\",\"update_date\":\" 00:00:20\"}],\"arr5\":[[\"product\",\"昨日\",\"今日\"],[\"盘管双斜口\",\"2\",\"2\"],[\"直管双斜口\",\"1\",\"1\"],[\"盘管无屑\",\"1\",\"1\"],[\"直管无屑\",\"0\",\"0\"]],\"jo6\":{\"sumproduce_orderqty\":\"\",\"sumfinishproduce_orderqty\":\"\",\"sumproducing_orderqty\":\"\"},\"arr7\":[{\"count\":\"0\",\"date\":\"07-10\"},{\"count\":\"0\",\"date\":\"07-11\"},{\"count\":\"0\",\"date\":\"07-12\"},{\"count\":\"0\",\"date\":\"07-13\"},{\"count\":\"0\",\"date\":\"07-14\"},{\"count\":\"0\",\"date\":\"07-15\"},{\"count\":\"0\",\"date\":\"07-16\"}]}}"; - } - //2车间旋压看板 - if ("2".equals(web_flag)) { - str = "{\"code\":\"1\",\"desc\":\"查询成功\",\"result\":{\"screenname\":\"车间旋压看板\",\"arr1\":[{\"workprocedure_name\":\"旋压下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"12\",\"device_num\":\"12\"},{\"workprocedure_name\":\"滚槽/打点\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"3\",\"device_num\":\"3\"},{\"workprocedure_name\":\"直管有屑下料\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"3\",\"device_num\":\"3\"}],\"arr2\":[{\"produceschedule_date\":\"2021-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"推弯一体机加工\",\"sysdic_name\":\"弯头工段\",\"worksection_type_scode\":\"01\",\"finishproduce_qty\":\"0\",\"produce_qty\":\"4200\",\"waiting_qty\":\"4200\",\"progress_qty\":\"0\"},{\"produceschedule_date\":\"2020-09-16\",\"produceorder_code\":\"0916014\",\"workprocedure_name\":\"盘管无屑下料\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"3500\",\"produce_qty\":\"3500\",\"waiting_qty\":\"0\",\"progress_qty\":\"100\"},{\"produceschedule_date\":\"2020-12-31\",\"produceorder_code\":\"1231013\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"790\",\"produce_qty\":\"3500\",\"waiting_qty\":\"2710\",\"progress_qty\":\"23\"},{\"produceschedule_date\":\"2020-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"4225\",\"produce_qty\":\"6000\",\"waiting_qty\":\"1775\",\"progress_qty\":\"70\"}],\"jo3\":{\"sumproduce_qty\":\"0\",\"sumfinishproduce_qty\":\"0\",\"sumproducing_qty\":\"0\",\"sumweek_qty\":\"0\"},\"arr4\":[],\"arr5\":[[\"product\",\"昨日\",\"今日\"],[\"旋压下料\",\"1\",\"0\"],[\"滚槽/打点\",\"0\",\"0\"],[\"直管有屑下料\",\"0\",\"0\"]],\"jo6\":{\"sumproduce_orderqty\":\"\",\"sumfinishproduce_orderqty\":\"\",\"sumproducing_orderqty\":\"\"},\"arr7\":[{\"count\":\"0\",\"date\":\"07-10\"},{\"count\":\"0\",\"date\":\"07-11\"},{\"count\":\"0\",\"date\":\"07-12\"},{\"count\":\"0\",\"date\":\"07-13\"},{\"count\":\"0\",\"date\":\"07-14\"},{\"count\":\"0\",\"date\":\"07-15\"},{\"count\":\"0\",\"date\":\"07-16\"}]}}"; - } - //3车间三通看板 - if ("3".equals(web_flag)) { - str = "{\"code\":\"1\",\"desc\":\"查询成功\",\"result\":{\"screenname\":\"车间三通看板\",\"arr1\":[{\"workprocedure_name\":\"三通拉伸\",\"device_runningnum\":\"1\",\"device_errornum\":\"0\",\"device_waitingnum\":\"1\",\"shutdownnum\":\"7\",\"device_num\":\"9\"},{\"workprocedure_name\":\"三通一体机加工\",\"device_runningnum\":\"1\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"8\",\"device_num\":\"9\"}],\"arr2\":[{\"produceschedule_date\":\"2021-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"推弯一体机加工\",\"sysdic_name\":\"弯头工段\",\"worksection_type_scode\":\"01\",\"finishproduce_qty\":\"0\",\"produce_qty\":\"4200\",\"waiting_qty\":\"4200\",\"progress_qty\":\"0\"},{\"produceschedule_date\":\"2020-09-16\",\"produceorder_code\":\"0916014\",\"workprocedure_name\":\"盘管无屑下料\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"3500\",\"produce_qty\":\"3500\",\"waiting_qty\":\"0\",\"progress_qty\":\"100\"},{\"produceschedule_date\":\"2020-12-31\",\"produceorder_code\":\"1231013\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"790\",\"produce_qty\":\"3500\",\"waiting_qty\":\"2710\",\"progress_qty\":\"23\"},{\"produceschedule_date\":\"2020-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"4225\",\"produce_qty\":\"6000\",\"waiting_qty\":\"1775\",\"progress_qty\":\"70\"}],\"jo3\":{\"sumproduce_qty\":\"0\",\"sumfinishproduce_qty\":\"0\",\"sumproducing_qty\":\"0\",\"sumweek_qty\":\"0\"},\"arr4\":[{\"device_name\":\"L22-3\",\"devicestatus_name\":\"专机故障报警\",\"update_date\":\" 00:00:29\"},{\"device_name\":\"L22-1\",\"devicestatus_name\":\"专机故障报警\",\"update_date\":\" 00:00:29\"},{\"device_name\":\"L15-4\",\"devicestatus_name\":\"专机故障报警\",\"update_date\":\" 00:00:29\"},{\"device_name\":\"L15-3\",\"devicestatus_name\":\"专机故障报警\",\"update_date\":\" 00:00:28\"}],\"arr5\":[[\"product\",\"昨日\",\"今日\"],[\"三通\",\"4\",\"4\"],[\"三通一体机\",\"0\",\"0\"]],\"jo6\":{\"sumproduce_orderqty\":\"\",\"sumfinishproduce_orderqty\":\"\",\"sumproducing_orderqty\":\"\"},\"arr7\":[{\"count\":\"0\",\"date\":\"07-10\"},{\"count\":\"0\",\"date\":\"07-11\"},{\"count\":\"0\",\"date\":\"07-12\"},{\"count\":\"0\",\"date\":\"07-13\"},{\"count\":\"0\",\"date\":\"07-14\"},{\"count\":\"0\",\"date\":\"07-15\"},{\"count\":\"0\",\"date\":\"07-16\"}]}}"; - } - //4车间推弯看板 - if ("4".equals(web_flag)) { - str = "{\"code\":\"1\",\"desc\":\"查询成功\",\"result\":{\"screenname\":\"车间推弯看板\",\"arr1\":[{\"workprocedure_name\":\"推弯一体机加工\",\"device_runningnum\":\"3\",\"device_errornum\":\"9\",\"device_waitingnum\":\"3\",\"shutdownnum\":\"16\",\"device_num\":\"31\"}],\"arr2\":[{\"produceschedule_date\":\"2021-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"推弯一体机加工\",\"sysdic_name\":\"弯头工段\",\"worksection_type_scode\":\"01\",\"finishproduce_qty\":\"0\",\"produce_qty\":\"4200\",\"waiting_qty\":\"4200\",\"progress_qty\":\"0\"},{\"produceschedule_date\":\"2020-09-16\",\"produceorder_code\":\"0916014\",\"workprocedure_name\":\"盘管无屑下料\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"3500\",\"produce_qty\":\"3500\",\"waiting_qty\":\"0\",\"progress_qty\":\"100\"},{\"produceschedule_date\":\"2020-12-31\",\"produceorder_code\":\"1231013\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"790\",\"produce_qty\":\"3500\",\"waiting_qty\":\"2710\",\"progress_qty\":\"23\"},{\"produceschedule_date\":\"2020-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"4225\",\"produce_qty\":\"6000\",\"waiting_qty\":\"1775\",\"progress_qty\":\"70\"}],\"jo3\":{\"sumproduce_qty\":\"31952\",\"sumfinishproduce_qty\":\"108048\",\"sumproducing_qty\":\"0\",\"sumweek_qty\":\"140000\"},\"arr4\":[],\"arr5\":[[\"product\",\"昨日\",\"今日\"],[\"推弯一体机加工\",\"0\",\"0\"]],\"jo6\":{\"sumproduce_orderqty\":\"\",\"sumfinishproduce_orderqty\":\"\",\"sumproducing_orderqty\":\"\"},\"arr7\":[{\"count\":\"0\",\"date\":\"07-10\"},{\"count\":\"0\",\"date\":\"07-11\"},{\"count\":\"0\",\"date\":\"07-12\"},{\"count\":\"0\",\"date\":\"07-13\"},{\"count\":\"0\",\"date\":\"07-14\"},{\"count\":\"0\",\"date\":\"07-15\"},{\"count\":\"0\",\"date\":\"07-16\"}]}}"; - } - //6车间刻字包装看板 - if ("6".equals(web_flag)) { - str = "{\"code\":\"1\",\"desc\":\"查询成功\",\"result\":{\"screenname\":\"车间刻字包装看板\",\"arr1\":[{\"workprocedure_name\":\"刻字\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"13\",\"device_num\":\"13\"},{\"workprocedure_name\":\"包装\",\"device_runningnum\":\"2\",\"device_errornum\":\"0\",\"device_waitingnum\":\"0\",\"shutdownnum\":\"0\",\"device_num\":\"2\"},{\"workprocedure_name\":\"码盘\",\"device_runningnum\":\"0\",\"device_errornum\":\"0\",\"device_waitingnum\":\"1\",\"shutdownnum\":\"0\",\"device_num\":\"1\"}],\"arr2\":[{\"produceschedule_date\":\"2021-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"推弯一体机加工\",\"sysdic_name\":\"弯头工段\",\"worksection_type_scode\":\"01\",\"finishproduce_qty\":\"0\",\"produce_qty\":\"4200\",\"waiting_qty\":\"4200\",\"progress_qty\":\"0\"},{\"produceschedule_date\":\"2020-09-16\",\"produceorder_code\":\"0916014\",\"workprocedure_name\":\"盘管无屑下料\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"3500\",\"produce_qty\":\"3500\",\"waiting_qty\":\"0\",\"progress_qty\":\"100\"},{\"produceschedule_date\":\"2020-12-31\",\"produceorder_code\":\"1231013\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"790\",\"produce_qty\":\"3500\",\"waiting_qty\":\"2710\",\"progress_qty\":\"23\"},{\"produceschedule_date\":\"2020-05-06\",\"produceorder_code\":\"0506009\",\"workprocedure_name\":\"三通拉伸\",\"sysdic_name\":\"综合工段\",\"worksection_type_scode\":\"02\",\"finishproduce_qty\":\"4225\",\"produce_qty\":\"6000\",\"waiting_qty\":\"1775\",\"progress_qty\":\"70\"}],\"jo3\":{\"sumproduce_qty\":\"0\",\"sumfinishproduce_qty\":\"0\",\"sumproducing_qty\":\"0\",\"sumweek_qty\":\"0\"},\"arr4\":[{\"device_name\":\"激光打标机06\",\"devicestatus_name\":\"急停报警\",\"update_date\":\" 00:00:35\"}],\"arr5\":[[\"product\",\"昨日\",\"今日\"],[\"刻字\",\"1\",\"1\"],[\"包装\",\"1\",\"0\"],[\"码盘\",\"0\",\"0\"]],\"jo6\":{\"sumproduce_orderqty\":\"\",\"sumfinishproduce_orderqty\":\"\",\"sumproducing_orderqty\":\"\"},\"arr7\":[{\"count\":\"0\",\"date\":\"07-10\"},{\"count\":\"0\",\"date\":\"07-11\"},{\"count\":\"0\",\"date\":\"07-12\"},{\"count\":\"0\",\"date\":\"07-13\"},{\"count\":\"0\",\"date\":\"07-14\"},{\"count\":\"0\",\"date\":\"07-15\"},{\"count\":\"0\",\"date\":\"07-16\"}]}}"; - } - - return JSONObject.parseObject(str); - } - - @Override - public Map queryInfo(Map whereJson, Pageable page) { - String queryType = MapUtils.getString(whereJson, "queryType"); - if (queryType.equals("shopInfo")) { - WQLObject wo_shopInfo = WQLObject.getWQLObject("EXT_BIG_ShopInfo"); - ResultBean rb = wo_shopInfo.pagequery(WqlUtil.getHttpContext(page), " 1 = 1", ""); - final JSONObject json = rb.pageResult(); - return json; - } - if (queryType.equals("todayAndPlanNum")) { - WQLObject wo_plan = WQLObject.getWQLObject("EXT_BIG_TodayAndPlanNum"); - ResultBean rb = wo_plan.pagequery(WqlUtil.getHttpContext(page), " 1 = 1", ""); - final JSONObject json = rb.pageResult(); - return json; - } - if (queryType.equals("stock")) { - WQLObject wo_stock = WQLObject.getWQLObject("EXT_BIG_Stock"); - ResultBean rb = wo_stock.pagequery(WqlUtil.getHttpContext(page), " 1 = 1", ""); - final JSONObject json = rb.pageResult(); - return json; - } - if (queryType.equals("supply")) { - WQLObject wo_supply = WQLObject.getWQLObject("EXT_BIG_Supply"); - ResultBean rb = wo_supply.pagequery(WqlUtil.getHttpContext(page), " 1 = 1", ""); - final JSONObject json = rb.pageResult(); - return json; - } - if (queryType.equals("yearInOut")) { - WQLObject wo_yearInOut = WQLObject.getWQLObject("EXT_BIG_YearInOut"); - ResultBean rb = wo_yearInOut.pagequery(WqlUtil.getHttpContext(page), " 1 = 1", ""); - final JSONObject json = rb.pageResult(); - return json; - } - return null; - } - - @Override - public void add(JSONObject param) throws Exception { - String addType = MapUtils.getString(param, "addType"); - if (addType.equals("shopInfo")) { - WQLObject wo_shopInfo = WQLObject.getWQLObject("EXT_BIG_ShopInfo"); - JSONObject jsonObject = wo_shopInfo.query().uniqueResult(0); - wo_shopInfo.delete(jsonObject); - param.put("shop_id", IdUtil.getSnowflake(1, 1).nextId()); - param.put("data", DateUtil.today()); - wo_shopInfo.insert(param); - } - if (addType.equals("todayAndPlanNum")) { - WQLObject wo_plan = WQLObject.getWQLObject("EXT_BIG_TodayAndPlanNum"); - param.put("pro_id", IdUtil.getSnowflake(1, 1).nextId()); - wo_plan.insert(param); - } - if (addType.equals("stock")) { - WQLObject wo_stock = WQLObject.getWQLObject("EXT_BIG_Stock"); - JSONArray resultJSONArray = wo_stock.query().getResultJSONArray(0); - for (int i = 0; i < resultJSONArray.size(); i++) { - JSONObject jsonObject = resultJSONArray.getJSONObject(i); - wo_stock.delete(jsonObject); - } - Date now = DateUtil.parseDate(DateUtil.today()); - for (int i = 1; i <= 14; i++) { - Date data = DateUtil.offsetDay(now, -i); - String formatbz = DateUtil.formatDate(data); - param.put("date", formatbz); - param.put("id", IdUtil.getSnowflake(1, 1).nextId()); - wo_stock.insert(param); - } - } - if (addType.equals("supply")) { - WQLObject wo_supply = WQLObject.getWQLObject("EXT_BIG_Supply"); - JSONArray resultJSONArray = wo_supply.query().getResultJSONArray(0); - for (int i = 0; i < resultJSONArray.size(); i++) { - JSONObject jsonObject = resultJSONArray.getJSONObject(i); - wo_supply.delete(jsonObject); - } - Date now = DateUtil.parseDate(DateUtil.today()); - for (int i = 1; i <= 14; i++) { - Date data = DateUtil.offsetDay(now, i); - String formatbz = DateUtil.formatDate(data); - param.put("date", formatbz); - param.put("id", IdUtil.getSnowflake(1, 1).nextId()); - wo_supply.insert(param); - } - } - if (addType.equals("yearInOut")) { - WQLObject wo_yearInOut = WQLObject.getWQLObject("EXT_BIG_YearInOut"); - JSONObject jsonObject = wo_yearInOut.query().uniqueResult(0); - wo_yearInOut.delete(jsonObject); - param.put("id", IdUtil.getSnowflake(1, 1).nextId()); - wo_yearInOut.insert(param); - } - this.autoInitial(); - } - - @Override - public void edit(JSONObject param) throws Exception { - String addType = MapUtils.getString(param, "addType"); - if (addType.equals("shopInfo")) { - WQLObject wo_shopInfo = WQLObject.getWQLObject("EXT_BIG_ShopInfo"); - wo_shopInfo.update(param); - } - if (addType.equals("todayAndPlanNum")) { - WQLObject wo_plan = WQLObject.getWQLObject("EXT_BIG_TodayAndPlanNum"); - wo_plan.update(param); - } - if (addType.equals("stock")) { - WQLObject wo_stock = WQLObject.getWQLObject("EXT_BIG_Stock"); - wo_stock.update(param); - } - if (addType.equals("supply")) { - WQLObject wo_supply = WQLObject.getWQLObject("EXT_BIG_Supply"); - wo_supply.update(param); - } - if (addType.equals("yearInOut")) { - WQLObject wo_yearInOut = WQLObject.getWQLObject("EXT_BIG_YearInOut"); - wo_yearInOut.update(param); - } - this.autoInitial(); - } - - @Override - public void del(Long[] ids) throws Exception { - Long id = ids[0]; - JSONObject param = new JSONObject(); - WQLObject wo_shopInfo = WQLObject.getWQLObject("EXT_BIG_ShopInfo"); - wo_shopInfo.delete("shop_id = '"+id+"'"); - - - WQLObject wo_plan = WQLObject.getWQLObject("EXT_BIG_TodayAndPlanNum"); - wo_plan.delete("pro_id = '"+id+"'"); - - - WQLObject wo_stock = WQLObject.getWQLObject("EXT_BIG_Stock"); - wo_stock.delete("id = '"+id+"'"); - - - WQLObject wo_supply = WQLObject.getWQLObject("EXT_BIG_Supply"); - wo_supply.delete("id = '"+id+"'"); - - - WQLObject wo_yearInOut = WQLObject.getWQLObject("EXT_BIG_YearInOut"); - wo_yearInOut.delete("id = '"+id+"'"); - - this.autoInitial(); - } - - @Override - public void autoInitial() throws Exception { - WQLObject wo_plan = WQLObject.getWQLObject("EXT_BIG_TodayAndPlanNum"); - WQLObject wo_shopInfo = WQLObject.getWQLObject("EXT_BIG_ShopInfo"); - WQLObject wo_stock = WQLObject.getWQLObject("EXT_BIG_Stock"); - WQLObject wo_supply = WQLObject.getWQLObject("EXT_BIG_Supply"); - WQLObject wo_yearInOut = WQLObject.getWQLObject("EXT_BIG_YearInOut"); - JSONArray planArray = wo_plan.query().getResultJSONArray(0); - JSONObject jsonObject = wo_shopInfo.query().uniqueResult(0); - JSONArray stockArray = wo_stock.query().getResultJSONArray(0); - JSONArray supplyArray = wo_supply.query().getResultJSONArray(0); - JSONObject yearInOutArray = wo_yearInOut.query().uniqueResult(0); - Random random = new Random(); - if (ObjectUtil.isNotEmpty(jsonObject)) { - shopinfoDtos = JSONObject.toJavaObject(jsonObject, ShopinfoDto.class); - } - if (ObjectUtil.isNotEmpty(planArray)) { - todayandplannumDtos = planArray.toJavaList(TodayandplannumDto.class); - } - if (ObjectUtil.isNotEmpty(stockArray)) { - stockDtos = stockArray.toJavaList(StockDto.class); - Iterator iterator = stockDtos.iterator(); - while (iterator.hasNext()) { - StockDto stockDto = iterator.next(); - stockDto.setRepertory(new BigDecimal(random.nextInt(30) + 170)); - } - } - if (ObjectUtil.isNotEmpty(supplyArray)) { - supplyDtos = supplyArray.toJavaList(SupplyDto.class); - Iterator iterator = supplyDtos.iterator(); - while (iterator.hasNext()) { - SupplyDto supplyDto = iterator.next(); - supplyDto.setNeed_num(new BigDecimal(random.nextInt(2) + 3)); - } - } - if (ObjectUtil.isNotEmpty(yearInOutArray)) { - yearinoutDtos = yearInOutArray.toJavaObject(YearinoutDto.class); - } - - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java deleted file mode 100644 index a1d20b6..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java +++ /dev/null @@ -1,514 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.impl; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUnit; -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 com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.DeviceScreenService; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.stereotype.Service; - -import java.util.Date; - -@Service -@RequiredArgsConstructor -@Slf4j -public class DeviceScreenServiceImpl implements DeviceScreenService { - @Override - public JSONObject deviceStatus(JSONObject param) { - //正常运行：有工单正在工作的；暂未生产：有工单没有在工作的；空闲设备：没有工单的，没故障的；故障设备：状态为故障的 - JSONArray device_rows = WQLObject.getWQLObject("PDM_BI_Device").query("is_active = '1' AND is_delete = '0'").getResultJSONArray(0); - int total_num = device_rows.size(); - - //查询故障设备 - JSONArray err_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "7").process().getResultJSONArray(0); - int err_device = err_rows.size(); - - //查询运行设备 - JSONArray run_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "8").process().getResultJSONArray(0); - int run_device = run_rows.size(); - - //查询有工单，没有故障的设备 - JSONArray task_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "9").process().getResultJSONArray(0); - //查询暂未生产设备 - int prepare_device = task_rows.size() - run_device; - - //空闲设备 - int free_device = total_num - task_rows.size() - err_device; - - - JSONArray result = new JSONArray(); - JSONObject run = new JSONObject(); - run.put("name","正常运行"); - run.put("value",run_device); - result.add(run); - JSONObject pre = new JSONObject(); - pre.put("name","暂未生产"); - pre.put("value",prepare_device); - result.add(pre); - JSONObject free = new JSONObject(); - free.put("name","空闲设备"); - free.put("value",free_device); - result.add(free); - JSONObject err = new JSONObject(); - err.put("name","故障设备"); - err.put("value",err_device); - result.add(err); - JSONObject jo = new JSONObject(); - jo.put("ja",result); - jo.put("total_num",total_num); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", jo); - return returnjo; - } - - @Override - public JSONObject oeeAndTeep(JSONObject param) { - JSONObject oee = new JSONObject(); - JSONObject teep = new JSONObject(); - //value1:过去一个月；value2：目标；value3：实际 - oee.put("value1", "78.0"); - oee.put("value2", "67.0"); - oee.put("value3", "48.0"); - teep.put("value1", "46.0"); - teep.put("value2", "51.0"); - teep.put("value3", "32.0"); - JSONObject result = new JSONObject(); - result.put("oee", oee); - result.put("teep", teep); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject queryDeviceByWork(JSONObject param) { - JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "1").process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceErrorNum(JSONObject param) { - JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "2").process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceManage(JSONObject param) { - String today = DateUtil.today() + "%"; - Date today_begin = DateUtil.beginOfDay(DateUtil.date()); - //弯头工段 - JSONObject jo1 = new JSONObject(); - jo1.put("oee", "45.8%"); - double wt_mibf = 0; - double wt_mttr = 0; - //计算mibf - JSONArray wt_run_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "3").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < wt_run_rows.size(); i++) { - JSONObject device = wt_run_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - } - - //计算mmttr - JSONArray wt_err_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "4").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < wt_err_rows.size(); i++) { - JSONObject device = wt_err_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - } - - jo1.put("MIBF", wt_mibf); - jo1.put("MTTR", wt_mttr); - jo1.put("err_times", wt_err_rows.size()); - //综合工段 - JSONObject jo2 = new JSONObject(); - jo2.put("oee", "45.8%"); - double zh_mibf = 0; - double zh_mttr = 0; - //计算mibf - JSONArray zh_run_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "3").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < zh_run_rows.size(); i++) { - JSONObject device = zh_run_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - } - - //计算mmttr - JSONArray zh_err_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "4").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < zh_err_rows.size(); i++) { - JSONObject device = zh_err_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - } - - jo2.put("MIBF", zh_mibf); - jo2.put("MTTR", zh_mttr); - jo2.put("err_times", zh_err_rows.size()); - //成品工段 - JSONObject jo3 = new JSONObject(); - jo3.put("oee", "45.8%"); - double cp_mibf = 0; - double cp_mttr = 0; - //计算mibf - JSONArray cp_run_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "3").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < cp_run_rows.size(); i++) { - JSONObject device = cp_run_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mibf += between; - } - } - - //计算mmttr - JSONArray cp_err_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "4").addParam("worksection_type_scode", "01").addParam("today", today).process().getResultJSONArray(0); - for (int i = 0; i < cp_err_rows.size(); i++) { - JSONObject device = cp_err_rows.getJSONObject(i); - String start_time = device.getString("start_time"); - String end_time = device.getString("end_time"); - if (start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date1 = DateUtil.parse(start_time); - Date date2 = DateUtil.date(); - long between = DateUtil.between(date1, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isEmpty(end_time)) { - Date date2 = DateUtil.date(); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - if (!start_time.startsWith(today) && StrUtil.isNotEmpty(end_time)) { - Date date2 = DateUtil.parse(end_time); - long between = DateUtil.between(today_begin, date2, DateUnit.HOUR); - wt_mttr += between; - } - } - - jo3.put("MIBF", cp_mibf); - jo3.put("MTTR", cp_mttr); - jo3.put("err_times", cp_err_rows.size()); - - JSONObject result = new JSONObject(); - result.put("jo1", jo1); - result.put("jo2", jo2); - result.put("jo3", jo3); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceCensus(JSONObject param) { - JSONArray pro_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "10").process().getResultJSONArray(0); - JSONArray result = new JSONArray(); - for (int i = 0; i < pro_rows.size(); i++) { - JSONObject pro = pro_rows.getJSONObject(i); - JSONObject jo = new JSONObject(); - int total_num = pro.getIntValue("total_num"); - String workprocedure_id = pro.getString("workprocedure_id"); - //查询故障设备 - JSONArray err_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "7").addParam("workprocedure_id", workprocedure_id).process().getResultJSONArray(0); - int err_device = err_rows.size(); - - //查询运行设备 - JSONArray run_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "8").addParam("workprocedure_id", workprocedure_id).process().getResultJSONArray(0); - int run_device = run_rows.size(); - - //查询有工单，没有故障的设备 - JSONArray task_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "9").addParam("workprocedure_id", workprocedure_id).process().getResultJSONArray(0); - //查询暂未生产设备 - int prepare_device = task_rows.size() - run_device; - - //空闲设备 - int free_device = total_num - task_rows.size() - err_device; - - jo.put("run_device", run_device); - jo.put("prepare_device", prepare_device); - jo.put("free_device", free_device); - jo.put("err_device", err_device); - jo.put("workprocedure_name", pro.getString("workprocedure_name")); - result.add(jo); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceErrorInfo(JSONObject param) { - String today = DateUtil.today() + "%"; - JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "5").addParam("today", today).process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceUseRate(JSONObject param) { - JSONArray pro_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "10").process().getResultJSONArray(0); - JSONArray result = new JSONArray(); - for (int i = 0; i < pro_rows.size(); i++) { - JSONObject pro = pro_rows.getJSONObject(i); - JSONObject jo = new JSONObject(); - jo.put("workprocedure_name", pro.getString("workprocedure_name")); - jo.put("teep", (i + 1) * 10); - result.add(jo); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject deviceStatusList(JSONObject param) { - String date = DateUtil.today() + "%"; - JSONArray device_rows = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "11").process().getResultJSONArray(0); - JSONArray result = new JSONArray(); - for (int i = 0; i < device_rows.size(); i++) { - int product_qty = 0; - JSONObject device = device_rows.getJSONObject(i); - device.put("start_time",""); - device.put("end_time",""); - device.put("product_time",""); - String device_id = device.getString("device_id"); - JSONArray order_rows = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND produce_date like '" + date + "' AND is_delete = '0'").getResultJSONArray(0); - for (int j = 0; j < order_rows.size(); j++) { - JSONObject order = order_rows.getJSONObject(i); - product_qty += order.getIntValue("real_qty"); - } -// device.put("product_qty", product_qty); - - //查询最近的一条开机状态 - JSONObject start_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '02' order by end_time desc").uniqueResult(0); - if (ObjectUtil.isNotEmpty(start_jo)) { - device.put("start_time", start_jo.getString("end_time")); - } - if (StrUtil.isEmpty(device.getString("status_type"))) { - //查询最近的一条关机状态 - JSONObject end_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '01' order by end_time desc").uniqueResult(0); - if (ObjectUtil.isNotEmpty(end_jo)) { - device.put("end_time", end_jo.getString("end_time")); - } - } - -// //查询最近的一个工单 -// JSONObject order_jo = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND is_delete = '0' order by realproducestart_date desc").uniqueResult(0); -// if (ObjectUtil.isNotEmpty(order_jo)) { -// device.put("product_time", order_jo.getString("produce_date")); -// } - result.add(device); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public JSONObject errCensus(JSONObject param) { - JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "6").process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "查询成功！"); - returnjo.put("result", result); - return returnjo; - } - - public JSONObject calculate(JSONObject jo) { - String date = jo.getString("date") + "%"; - String device_id = jo.getString("device_id"); - //type:1、目标；2、实际 - String type = jo.getString("type"); - - //查询当天该设备的产量 - int total_qty = 0; - JSONArray order_rows = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND produce_date like '" + date + "' AND is_delete = '0'").getResultJSONArray(0); - for (int i = 0; i < order_rows.size(); i++) { - JSONObject order = order_rows.getJSONObject(i); - total_qty += order.getIntValue("real_qty"); - } - - //查询该设备对应的产能 - JSONObject device = WQLObject.getWQLObject("PDM_BI_Device").query("device_id = '" + device_id + "'").uniqueResult(0); - double productivity = device.getDoubleValue("productivity"); - - //故障时间汇总 - JSONArray err_rows = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '05' AND start_time like '" + date + "'").getResultJSONArray(0); - double err_time = 0; - for (int i = 0; i < err_rows.size(); i++) { - JSONObject err_jo = err_rows.getJSONObject(i); - String start_time = err_jo.getString("start_time"); - String end_time = err_jo.getString("end_time"); - if (StrUtil.isEmpty(end_time)) { - end_time = DateUtil.now(); - } - long between = DateUtil.between(DateUtil.parse(start_time), DateUtil.parse(end_time), DateUnit.MINUTE); - err_time += between; - } - - err_time = NumberUtil.round(err_time, 2).doubleValue(); - - double oee = 0.0; - //OEE计算目标：当天汇总/（产能x负荷时间）；实际：（班制时间-故障时间）/班制时间 * （当天工单汇总/（产能*（符合时间-故障时间）））* 98% - if (type.equals("1")) { - //8是指符合时间，也就是每天的工作时间 - oee = NumberUtil.div(total_qty, NumberUtil.mul(8, productivity)); - } else { - //（班制时间-故障时间）/班制时间 - double value1 = NumberUtil.div(NumberUtil.sub(8 * 60, err_time), 8 * 60); - //（产能*（符合时间-故障时间） - double value2 = NumberUtil.div(total_qty, NumberUtil.mul(productivity, value1)); - oee = NumberUtil.mul(value1, value2); - } - - double teep = 0.0; - //TEEP计算：OEE*（班制时间-计划停机时间）/班制时间 - teep = NumberUtil.div(oee, 0.9); - JSONObject result = new JSONObject(); - result.put("oee", oee); - result.put("teep", teep); - return result; - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java deleted file mode 100644 index ebb82d3..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java +++ /dev/null @@ -1,247 +0,0 @@ -package org.nl.wms.ext.bigScreen.service.impl; - -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.ProductService; -import org.nl.wql.WQL; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -@Service -@RequiredArgsConstructor -@Slf4j -public class ProductServiceImpl implements ProductService { - private String now = DateUtil.now(); - private String today = DateUtil.today(); - //一个月的开始日期 - private String beginOfMonth = DateUtil.formatTime(DateUtil.beginOfMonth(DateUtil.parseDate(today))); - - @Override - public Map planReached(Map param) { - //计算当天的计划达成 - //01-弯头工段、02-综合工段、03-成品工段 - Map map = new HashMap(); - map.put("flag", "1"); - map.put("produce_date", today); - map.put("worksection_type_scode","01"); - JSONObject jo1 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","02"); - JSONObject jo2 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","03"); - JSONObject jo3 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - JSONObject dayResult = new JSONObject(); - dayResult.put("jo1",jo1); - dayResult.put("jo2",jo2); - dayResult.put("jo3",jo3); - - //计算一个月的计划达成 - JSONObject monthResult = new JSONObject(); - map.put("flag", "14"); - map.put("end_produce_date", today); - map.put("begin_produce_date", beginOfMonth); - map.put("worksection_type_scode","01"); - JSONObject joo1 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","02"); - JSONObject joo2 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - map.put("worksection_type_scode","03"); - JSONObject joo3 = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - - monthResult.put("joo1",joo1); - monthResult.put("joo2",joo2); - monthResult.put("joo3",joo3); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("dayResult", dayResult); - returnjo.put("monthResult", monthResult); - return returnjo; - } - - @Override - public Map productSchedule(Map param) { - //今日排产生产进度跟踪 - Map map = new HashMap(); - map.put("flag", "2"); - map.put("produce_date", today); - JSONArray result = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", result); - return returnjo; - } - - @Override - public Map output(Map param) { - JSONObject result = new JSONObject(); - Map map = new HashMap(); - // map.put("flag", "3"); - map.put("flag", "7"); - map.put("produce_date", today); - //统计产量方式一： 1 计算工单物料 2 计算每个物料清洗前一个工序 3拿着工序+物料 关联工单表 统计总数 - //1激光下料——推弯——清洗 - //2旋压-清洗 - //3盘管无屑下料-三通拉伸-镗孔-清洗 - //4直管无屑下料-镗孔-清洗 - //统计产量方式二: 只需要统计 推弯，旋压。镗孔 3个工序工单的数量 （'07','06','02'） - JSONObject joo = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - result.put("real_qty", joo.getString("real_qty")); - result.put("plan_qty", joo.getString("plan_qty")); - result.put("finish_rate", joo.getString("finish_rate")); - //统计工单个数 - map.put("flag", "4"); - int sum_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("count"); - //统计延时工单 - map.put("product_date",today); - map.put("flag", "5"); - - int delayed_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("count"); - result.put("sum_qty", sum_qty); - result.put("delayed_qty", delayed_qty); - result.put("normal_qty", sum_qty - delayed_qty); - - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", result); - return returnjo; - } - - - @Override - public Map worksectionHarvest(Map param) { - //近一周工段产量 - //获取一周的日期 - JSONArray dataArr = new JSONArray(); - JSONArray results = new JSONArray(); - for (int i = 0; i < 7; i++) { - DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(now), -i); - dataArr.add(dateTime.toString().substring(0, 10)); - } - for (int i = 0; i < dataArr.size(); i++) { - JSONObject jo = new JSONObject(); - String date = dataArr.get(( dataArr.size()-i-1)).toString(); - - //01-弯头工段、02-综合工段、03-成品工段 - Map map = new HashMap(); - map.put("flag", "15"); - map.put("produce_date", date); - map.put("worksection_type_scode", "01"); - int elbow_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("real_qty"); - jo.put("elbow_qty", elbow_qty); - map.put("worksection_type_scode", "02"); - int comprehensive_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("real_qty"); - jo.put("comprehensive_qty", comprehensive_qty); - map.put("worksection_type_scode", "03"); - int end_product_qty = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("real_qty"); - jo.put("end_product_qty", end_product_qty); - jo.put("date",date.substring(5,date.length())); - results.add(jo); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", results); - return returnjo; - } - - @Override - public Map topHarvest(Map param) { - //今日Top10产量 - Map map = new HashMap(); - map.put("flag", "10"); - map.put("produce_date", today); - JSONArray results = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", results); - return returnjo; - } - - @Override - public Map monthHarvest(Map param) { - //30天产量走势 - JSONArray dataArr = new JSONArray(); - JSONArray results = new JSONArray(); - for (int i = 0; i < 30; i++) { - DateTime dateTime = DateUtil.offsetDay(DateUtil.parse(now), -i); - dataArr.add(dateTime.toString().substring(0, 10)); - } - for (int i = 0; i < dataArr.size(); i++) { - JSONObject jo = new JSONObject(); - String date = dataArr.get(dataArr.size()-i-1).toString(); - - Map map = new HashMap(); - map.put("flag", "9"); - map.put("produce_date", date); - int real_qty = 0; - JSONObject jsonObject = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - real_qty = jsonObject.getIntValue("real_qty"); - } - jo.put("real_qty", real_qty); - jo.put("date", date.substring(5,date.length())); - results.add(jo); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", results); - return returnjo; - } - - @Override - public Map unfinishOrder(Map param) { - Map map = new HashMap(); - map.put("flag", "11"); - map.put("produce_date", today); - JSONArray results = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().getResultJSONArray(0); - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", results); - return returnjo; - } - - @Override - public Map monthOrder(Map param) { - //计算前9种物料产能 - Map map = new HashMap(); - map.put("flag", "12"); - map.put("produce_date", today); - map.put("end_produce_date", today); - map.put("begin_produce_date", beginOfMonth); - JSONArray results = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().getResultJSONArray(0); - //计算所有的产能 - map.put("flag", "13"); - int sum_count = WQL.getWO("BIGSCREENPRODUCT").addParamMap(map).process().uniqueResult(0).getIntValue("real_qty"); - //前几种物料的总和 - int count_num_flag = 0; - //如果有9种物料则需要计算其他 - if (results.size() == 9) { - for (int i = 0; i < results.size(); i++) { - count_num_flag = count_num_flag + results.getJSONObject(i).getIntValue("real_qty"); - } - } - if (count_num_flag < sum_count) { - JSONObject joo = new JSONObject(); - joo.put("material_name", "其他"); - joo.put("material_spec", "其他"); - joo.put("real_qty", sum_count - count_num_flag); - results.add(joo); - } - JSONObject returnjo = new JSONObject(); - returnjo.put("code", "1"); - returnjo.put("desc", "操作成功！"); - returnjo.put("result", results); - return returnjo; - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/AGVBIGSCREEN01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/AGVBIGSCREEN01.wql deleted file mode 100644 index 6acd1de..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/AGVBIGSCREEN01.wql +++ /dev/null @@ -1,109 +0,0 @@ -[交易说明] - 交易名： AGV监控中心查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.today TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - count(task.task_id) AS all_task_number - FROM - SCH_BASE_Task task - WHERE - 1 = 1 - - OPTION 输入.today <> "" - task.create_time like 输入.today - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - count(task.task_id) AS finish_task_number - FROM - SCH_BASE_Task task - WHERE - task.task_status = '99' - - OPTION 输入.today <> "" - task.create_time like 输入.today - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - count(task.task_id) AS cancel_task_number - FROM - SCH_BASE_Task task - WHERE - task.is_delete = '1' - - OPTION 输入.today <> "" - task.create_time like 输入.today - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - count(task.task_id) AS not_finish_task_number - FROM - SCH_BASE_Task task - WHERE - task.task_status <> '99' - - OPTION 输入.today <> "" - task.create_time like 输入.today - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql deleted file mode 100644 index 445d543..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql +++ /dev/null @@ -1,387 +0,0 @@ -[交易说明] - 交易名： bom查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.workprocedure TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - 输入.now_time TYPEAS s_string - 输入.produce_date TYPEAS s_string - 输入.end_produce_date TYPEAS s_string - 输入.begin_produce_date TYPEAS s_string - 输入.worksection_type_scode TYPEAS s_string - - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - - sum( shiftorder.real_qty ) AS real_qty, - sum( shiftorder.plan_qty ) AS plan_qty , - convert(sum( shiftorder.real_qty )/sum( shiftorder.plan_qty ),DECIMAL(10,2))*100 as finish_rate - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - where - - shiftorder.is_delete='0' - OPTION 输入.worksection_type_scode <> "" - workprocedure.worksection_type_scode = 输入.worksection_type_scode - ENDOPTION - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - shiftorder.produceorder_code, - shiftorder.plan_qty, - shiftorder.real_qty, - (shiftorder.plan_qty - shiftorder.real_qty) AS gap_qty, - material.material_code, - material.material_name, - material.material_spec, - CONVERT ( ( shiftorder.real_qty / shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate - FROM - mps_bd_produceshiftorder shiftorder - left join md_me_materialbase material on material.material_id =shiftorder.material_id - where - shiftorder.is_delete='0' - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - -IF 输入.flag = "3" - QUERY - SELECT - sum( shiftorder.real_qty ) AS real_qty, - sum( shiftorder.plan_qty ) AS plan_qty, - CONVERT ( sum( shiftorder.real_qty ) / sum( shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate - FROM - mps_bd_produceshiftorder shiftorder - RIGHT JOIN ( - SELECT - route.material_id, - dtl.workprocedure_id - FROM - PDM_BI_ProductProcessRoute route - LEFT JOIN PDM_BI_ProductProcessRouteDtl dtl ON route.productprocess_id = dtl.productprocess_id - WHERE - route.material_id IN ( SELECT DISTINCT shiftorder.material_id FROM mps_bd_produceshiftorder shiftorder ) - AND dtl.nextworkprocedure_id = '1535144552481034240' - ) a ON a.material_id = shiftorder.material_id - AND a.workprocedure_id = shiftorder.workprocedure_id - where - 1=1 - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY -ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - count(*) as count - FROM - mps_bd_produceshiftorder shiftorder - where - shiftorder.is_delete='0' - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - count(*) as count - FROM - mps_bd_produceshiftorder shiftorder - where - shiftorder.realproduceend_date > shiftorder.planproduceend_date - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "7" - QUERY - SELECT - sum( real_qty ) AS real_qty, - sum( plan_qty ) AS plan_qty, - CONVERT ( sum( shiftorder.real_qty ) / sum( shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON workprocedure.workprocedure_id = shiftorder.workprocedure_id - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - -IF 输入.flag = "8" - QUERY - SELECT - workprocedure.worksection_type_scode, - sum( real_qty ) AS real_qty, - sum( plan_qty ) AS plan_qty, - shiftorder.produce_date as date, - CONVERT ( sum( shiftorder.real_qty ) / sum( shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - WHERE - shiftorder.is_delete='0' - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - GROUP BY worksection_type_scode,shiftorder.produce_date - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "9" - QUERY - SELECT - sum( real_qty ) AS real_qty - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - GROUP BY worksection_type_scode - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "10" - QUERY - SELECT - shiftorder.material_id, - material.material_code, - material.material_name, - material.material_spec, - sum( real_qty ) AS real_qty - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - left join md_me_materialbase material on material.material_id =shiftorder.material_id - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - GROUP BY - shiftorder.material_id, - material.material_code, - material.material_name, - material.material_spec - ORDER BY real_qty desc - LIMIT 0,10 - ENDSELECT - ENDQUERY -ENDIF - - -IF 输入.flag = "11" - QUERY - SELECT - shiftorder.produceorder_code, - shiftorder.material_id, - material.material_code, - material.material_name, - material.material_spec, - shiftorder. real_qty, - shiftorder.plan_qty, - shiftorder.plan_qty -shiftorder. real_qty as gap_qty, - shiftorder.produce_date as date - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - left join md_me_materialbase material on material.material_id =shiftorder.material_id - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - and shiftorder. real_qty < shiftorder.plan_qty - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY -ENDIF - - -IF 输入.flag = "12" - QUERY - SELECT - shiftorder.material_id, - material.material_code, - material.material_name, - material.material_spec, - sum( real_qty ) AS real_qty - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - left join md_me_materialbase material on material.material_id =shiftorder.material_id - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - OPTION 输入.end_produce_date <> "" - shiftorder.produce_date <= 输入.end_produce_date - ENDOPTION - OPTION 输入.begin_produce_date <> "" - shiftorder.produce_date >= 输入.begin_produce_date - ENDOPTION - GROUP BY - shiftorder.material_id, - material.material_code, - material.material_spec, - material.material_name - ORDER BY real_qty desc - LIMIT 0,9 - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "13" - QUERY - SELECT - sum( real_qty ) AS real_qty - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - left join md_me_materialbase material on material.material_id =shiftorder.material_id - WHERE - shiftorder.is_delete='0' - and workprocedure.workprocedure_code IN ( '07', '06', '02' ) - OPTION 输入.end_produce_date <> "" - shiftorder.produce_date <= 输入.end_produce_date - ENDOPTION - OPTION 输入.begin_produce_date <> "" - shiftorder.produce_date >= 输入.begin_produce_date - ENDOPTION - - ENDSELECT - ENDQUERY -ENDIF - -IF 输入.flag = "14" - QUERY - SELECT - - sum( shiftorder.real_qty ) AS real_qty, - sum( shiftorder.plan_qty ) AS plan_qty , - convert(sum( shiftorder.real_qty )/sum( shiftorder.plan_qty ),DECIMAL(10,2))*100 as finish_rate - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - where - shiftorder.is_delete='0' - OPTION 输入.worksection_type_scode <> "" - workprocedure.worksection_type_scode = 输入.worksection_type_scode - ENDOPTION - OPTION 输入.end_produce_date <> "" - shiftorder.produce_date <= 输入.end_produce_date - ENDOPTION - OPTION 输入.begin_produce_date <> "" - shiftorder.produce_date >= 输入.begin_produce_date - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "15" - QUERY - SELECT - sum( real_qty ) AS real_qty, - sum( plan_qty ) AS plan_qty, - CONVERT ( sum( shiftorder.real_qty ) / sum( shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate - FROM - mps_bd_produceshiftorder shiftorder - LEFT JOIN pdm_bi_workprocedure workprocedure ON shiftorder.workprocedure_id = workprocedure.workprocedure_id - LEFT JOIN sys_dict_detail sys ON sys.VALUE= workprocedure.worksection_type_scode AND sys.dict_id = '87' - WHERE - shiftorder.is_delete='0' - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - OPTION 输入.worksection_type_scode <> "" - workprocedure.worksection_type_scode = 输入.worksection_type_scode - ENDOPTION - OPTION 输入.produce_date <> "" - shiftorder.produce_date = 输入.produce_date - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql deleted file mode 100644 index 6b2eb9f..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql +++ /dev/null @@ -1,266 +0,0 @@ -[交易说明] - 交易名： 物料分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.worksection_type_scode TYPEAS s_string - 输入.today TYPEAS s_string - 输入.workprocedure_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - MAX( productivity ) AS max_productivity, - MIN( productivity ) AS min_productivity, - ROUND( SUM( productivity )/ COUNT( device_id ), 3 ) AS ave_productivity, - MAX(pro.workprocedure_name) AS workprocedure_name - FROM - pdm_bi_device device - LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id - WHERE - device.is_active = '1' - AND - device.is_delete = '0' - GROUP BY - device.workprocedure_id - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - COUNT(run.device_id) AS err_num, - MAX(device.device_name) AS device_name - FROM - pdm_bi_devicerunstatusrecord run - LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id - GROUP BY - run.device_id - ORDER BY err_num desc - LIMIT 10 - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - device.device_id, - run.start_time, - run.end_time - FROM - pdm_bi_device device - LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id - INNER JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id - WHERE - pro.worksection_type_scode = 输入.worksection_type_scode - AND ( - run.start_time LIKE 输入.today - OR run.end_time LIKE 输入.today - OR run.end_time IS NULL - OR run.end_time = '' - ) - AND run.status_type = '03' - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - device.device_id, - run.start_time, - run.end_time - FROM - pdm_bi_device device - LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id - INNER JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id - WHERE - pro.worksection_type_scode = 输入.worksection_type_scode - AND ( - run.start_time LIKE 输入.today - OR run.end_time LIKE 输入.today - OR run.end_time IS NULL - OR run.end_time = '' - ) - AND run.status_type = '05' - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - run.start_time, - device.device_code, - device.device_name, - err.err_name - FROM - pdm_bi_devicerunstatusrecord run - LEFT JOIN pdm_bi_devicerunerrorlink err ON err.err_status_id = run.err_status_id - LEFT JOIN pdm_bi_device device ON run.device_id = device.device_id - WHERE - run.status_type = '05' - AND - run.start_time like 输入.today - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "6" - QUERY - SELECT - COUNT( record_id ) AS err_times, - MAX( device.device_name ) AS device_name - FROM - pdm_bi_devicerunstatusrecord run - LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id - WHERE - run.status_type = '05' - AND DATE_SUB( CURDATE(), INTERVAL 10 DAY ) <= date( start_time ) - GROUP BY - run.device_id - LIMIT 10 - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "7" - QUERY - SELECT - device.device_id - FROM - pdm_bi_devicerunstatusrecord run - LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id - WHERE - status_type = '05' - AND - IFNULL( end_time, '' ) = '' - OPTION 输入.workprocedure_id <> "" - device.workprocedure_id = 输入.workprocedure_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "8" - QUERY - SELECT - device.device_id - FROM - pdm_bi_devicerunstatusrecord run - LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id - WHERE - status_type = '03' - AND - IFNULL( end_time, '' ) = '' - OPTION 输入.workprocedure_id <> "" - device.workprocedure_id = 输入.workprocedure_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "9" - QUERY - SELECT DISTINCT - device.device_id - FROM - pdm_bi_device device - LEFT JOIN mps_bd_produceshiftorder shift ON shift.device_id = device.device_id - LEFT JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id - WHERE - shift.is_delete = '0' - AND - shift.order_status <> '04' - AND - (run.status_type <> '05' OR (run.status_type = '05' AND IFNULL(run.end_time,'') <> '') OR run.status_type IS NULL) - OPTION 输入.workprocedure_id <> "" - device.workprocedure_id = 输入.workprocedure_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "10" - QUERY - SELECT - device.workprocedure_id, - COUNT(device_id) AS total_num, - MAX(pro.workprocedure_name) AS workprocedure_name - FROM - pdm_bi_device device - LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id - WHERE - device.is_delete = '0' - AND - device.is_active = '1' - GROUP BY - device.workprocedure_id - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "11" - QUERY - SELECT - device.device_code, - device.device_name, - pro.workprocedure_name, - (case when run.status_type is null then '关机' - when run.status_type = '02' then '开机' - when run.status_type = '03' then '生产中' - when run.status_type = '04' then '待机' - when run.status_type = '05' then '故障' - end - ) AS device_status, - device.device_id, - run.status_type - FROM - pdm_bi_device device - LEFT JOIN pdm_bi_devicerunstatusrecord run ON run.device_id = device.device_id AND IFNULL(run.end_time,'') = '' - LEFT JOIN pdm_bi_workprocedure pro ON pro.workprocedure_id = device.workprocedure_id - ENDSELECT - ENDQUERY - ENDIF - - - - - - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/bigScreen.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/bigScreen.xls deleted file mode 100644 index b49844c..0000000 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/bigScreen.xls and /dev/null differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls deleted file mode 100644 index 80ca82b..0000000 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls and /dev/null differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/1.txt b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/1.txt deleted file mode 100644 index e69de29..0000000 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java deleted file mode 100644 index 2319a3d..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.pcs.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.pcs.service.DeliveryOrderService; -import org.nl.wms.pcs.service.dto.DeliveryOrderDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-06-01 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "发货单管理") -@RequestMapping("/api/deliveryOrder") -@Slf4j -public class DeliveryOrderController { - - private final DeliveryOrderService deliveryOrderService; - - @GetMapping - @Log("查询发货单") - @ApiOperation("查询发货单") - //@PreAuthorize("@el.check('deliveryOrder:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(deliveryOrderService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增发货单") - @ApiOperation("新增发货单") - //@PreAuthorize("@el.check('deliveryOrder:add')") - public ResponseEntity create(@Validated @RequestBody DeliveryOrderDto dto){ - deliveryOrderService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改发货单") - @ApiOperation("修改发货单") - //@PreAuthorize("@el.check('deliveryOrder:edit')") - public ResponseEntity update(@Validated @RequestBody DeliveryOrderDto dto){ - deliveryOrderService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除发货单") - @ApiOperation("删除发货单") - //@PreAuthorize("@el.check('deliveryOrder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - deliveryOrderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java deleted file mode 100644 index e1d0263..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.pcs.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.annotation.Log; -import org.nl.wms.pcs.service.SaleOrderService; -import org.nl.wms.pcs.service.dto.SaleOrderDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-06-01 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "销售订单管理") -@RequestMapping("/api/saleOrder") -@Slf4j -public class SaleOrderController { - - private final SaleOrderService saleOrderService; - - @GetMapping - @Log("查询销售订单") - @ApiOperation("查询销售订单") - //@PreAuthorize("@el.check('saleOrder:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(saleOrderService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增销售订单") - @ApiOperation("新增销售订单") - //@PreAuthorize("@el.check('saleOrder:add')") - public ResponseEntity create(@Validated @RequestBody SaleOrderDto dto){ - saleOrderService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改销售订单") - @ApiOperation("修改销售订单") - //@PreAuthorize("@el.check('saleOrder:edit')") - public ResponseEntity update(@Validated @RequestBody SaleOrderDto dto){ - saleOrderService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除销售订单") - @ApiOperation("删除销售订单") - //@PreAuthorize("@el.check('saleOrder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - saleOrderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java deleted file mode 100644 index d339715..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.pcs.service; - -import org.nl.wms.pcs.service.dto.DeliveryOrderDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-06-01 -**/ -public interface DeliveryOrderService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param deliver_id ID - * @return DeliveryOrder - */ - DeliveryOrderDto findById(Long deliver_id); - - /** - * 根据编码查询 - * @param code code - * @return DeliveryOrder - */ - DeliveryOrderDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(DeliveryOrderDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(DeliveryOrderDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java deleted file mode 100644 index 5dbf55e..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.pcs.service; - -import org.nl.wms.pcs.service.dto.SaleOrderDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-06-01 -**/ -public interface SaleOrderService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param sale_id ID - * @return SaleOrder - */ - SaleOrderDto findById(Long sale_id); - - /** - * 根据编码查询 - * @param code code - * @return SaleOrder - */ - SaleOrderDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(SaleOrderDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(SaleOrderDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java deleted file mode 100644 index 95efae2..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.nl.wms.pcs.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author geng by -* @date 2022-06-01 -**/ -@Data -public class DeliveryOrderDto implements Serializable { - - /** 发货单标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long deliver_id; - - /** 发货单号 */ - private String deliver_code; - - /** 明细序号 */ - private BigDecimal seq_no; - - /** 发货单类型 */ - private String deliver_type; - - /** 物料标识 */ - private Long material_id; - - /** 状态 */ - private String status; - - /** 发货数量 */ - private BigDecimal delivery_qty; - - /** 客户标识 */ - private Long cust_id; - - /** 计量单位标识 */ - private Long qty_unit_id; - - /** 销售单标识 */ - private Long sale_id; - - /** 销售单号 */ - private String sale_code; - - /** 销售明细序号 */ - private BigDecimal sale_seq_no; - - /** 创建人 */ - private Long create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - /** 客户编码 */ - private String cust_code; - - /** 客户名称 */ - private String cust_name; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java deleted file mode 100644 index 4e10923..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.nl.wms.pcs.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author geng by -* @date 2022-06-01 -**/ -@Data -public class SaleOrderDto implements Serializable { - - /** 销售单标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long sale_id; - - /** 销售单号 */ - private String sale_code; - - /** 明细序号 */ - private BigDecimal seq_no; - - /** 销售单类型 */ - private String sale_type; - - /** 物料标识 */ - private Long material_id; - - /** 状态 */ - private String status; - - /** 销售数量 */ - private BigDecimal sale_qty; - - /** 生产顺序 */ - private BigDecimal produce_seq; - - /** 客户标识 */ - private Long cust_id; - - /** 计量单位标识 */ - private Long qty_unit_id; - - /** 计划交期 */ - private String plandeliver_date; - - /** 创建人 */ - private Long create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private Long update_optid; - - /** 修改人 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - - /** 客户编码 */ - private String cust_code; - - /** 客户名称 */ - private String cust_name; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java deleted file mode 100644 index 8e5458d..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java +++ /dev/null @@ -1,155 +0,0 @@ - -package org.nl.wms.pcs.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.pcs.service.DeliveryOrderService; -import org.nl.wms.pcs.service.dto.DeliveryOrderDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-06-01 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class DeliveryOrderServiceImpl implements DeliveryOrderService { - private final ClassstandardService classstandardService; - @Override - public Map queryAll(Map whereJson, Pageable page){ - String deliver_code = MapUtil.getStr(whereJson, "deliver_code"); - String material = MapUtil.getStr(whereJson, "material"); - String parent_id = MapUtil.getStr(whereJson, "product_series"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - String status = MapUtil.getStr(whereJson, "status"); - String product_series = ""; - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("begin_time", begin_time); - map.put("end_time", end_time); - map.put("status", status); - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(parent_id)) { - product_series = classstandardService.getChildIdStr(parent_id); - map.put("product_series", product_series); - } - if (StrUtil.isNotEmpty(deliver_code)) { - map.put("deliver_code", "%" + deliver_code + "%"); - } - JSONObject json = WQL.getWO("PCS_DELIVERYORDER001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "deliveryorder.create_time desc"); - return json; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeliveryOrderDto.class); - return null; - } - - @Override - public DeliveryOrderDto findById(Long deliver_id) { - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = wo.query("deliver_id = '" + deliver_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( DeliveryOrderDto.class); - } - return null; - } - - @Override - public DeliveryOrderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( DeliveryOrderDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(DeliveryOrderDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - dto.setDeliver_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeliveryOrderDto dto) { - DeliveryOrderDto entity = this.findById(dto.getDeliver_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - for (Long deliver_id: ids) { - JSONObject param = new JSONObject(); - param.put("deliver_id", String.valueOf(deliver_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java deleted file mode 100644 index 53f8edb..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java +++ /dev/null @@ -1,155 +0,0 @@ - -package org.nl.wms.pcs.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.exception.BadRequestException; -import org.nl.utils.SecurityUtils; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.pcs.service.SaleOrderService; -import org.nl.wms.pcs.service.dto.SaleOrderDto; -import org.nl.wql.WQL; -import org.nl.wql.core.bean.WQLObject; -import org.nl.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-06-01 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SaleOrderServiceImpl implements SaleOrderService { - private final ClassstandardService classstandardService; - @Override - public Map queryAll(Map whereJson, Pageable page){ - String sale_code = MapUtil.getStr(whereJson, "sale_code"); - String material = MapUtil.getStr(whereJson, "material"); - String parent_id = MapUtil.getStr(whereJson, "product_series"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - String status = MapUtil.getStr(whereJson, "status"); - String product_series = ""; - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("begin_time", begin_time); - map.put("end_time", end_time); - map.put("status", status); - if (StrUtil.isNotEmpty(sale_code)) { - map.put("sale_code", "%" + sale_code + "%"); - } - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(parent_id)) { - product_series = classstandardService.getChildIdStr(parent_id); - map.put("product_series", product_series); - } - JSONObject json = WQL.getWO("PCS_SALEORDER001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "saleorder.create_time desc"); - return json; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SaleOrderDto.class); - return null; - } - - @Override - public SaleOrderDto findById(Long sale_id) { - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = wo.query("sale_id = '" + sale_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SaleOrderDto.class); - } - return null; - } - - @Override - public SaleOrderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SaleOrderDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SaleOrderDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - dto.setSale_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SaleOrderDto dto) { - SaleOrderDto entity = this.findById(dto.getSale_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - for (Long sale_id: ids) { - JSONObject param = new JSONObject(); - param.put("sale_id", String.valueOf(sale_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql deleted file mode 100644 index 25c25dc..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql +++ /dev/null @@ -1,85 +0,0 @@ -[交易说明] - 交易名： 发货单查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.deliver_code TYPEAS s_string - 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string - 输入.status TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - deliveryorder.*, - material.material_code, - material.material_name, - unit.unit_name - FROM - PCS_delivery_order deliveryorder - left join md_me_materialbase material on deliveryorder.material_id = material.material_id - left join md_pb_measureunit unit on deliveryorder.qty_unit_id = unit.measure_unit_id - WHERE - 1 = 1 - OPTION 输入.deliver_code <> "" - (deliveryorder.deliver_code like 输入.deliver_code) - ENDOPTION - OPTION 输入.status <> "" - deliveryorder.status = 输入.status - ENDOPTION - OPTION 输入.product_series <> "" - material.product_series in 输入.product_series - ENDOPTION - OPTION 输入.begin_time <> "" - deliveryorder.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - deliveryorder.create_time <= 输入.end_time - ENDOPTION - OPTION 输入.material <> "" - ( - material.material_code like 输入.material or - material.material_name like 输入.material or - material.material_spec like 输入.material - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql deleted file mode 100644 index 7447c5d..0000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql +++ /dev/null @@ -1,85 +0,0 @@ -[交易说明] - 交易名： 销售订单查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.sale_code TYPEAS s_string - 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string - 输入.status TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - saleorder.*, - material.material_code, - material.material_name, - unit.unit_name - FROM - PCS_sale_order saleorder - left join md_me_materialbase material on saleorder.material_id = material.material_id - left join md_pb_measureunit unit on saleorder.qty_unit_id = unit.measure_unit_id - WHERE - 1 = 1 - OPTION 输入.sale_code <> "" - (saleorder.sale_code like 输入.sale_code) - ENDOPTION - OPTION 输入.status <> "" - saleorder.status = 输入.status - ENDOPTION - OPTION 输入.product_series <> "" - material.product_series in 输入.product_series - ENDOPTION - OPTION 输入.begin_time <> "" - saleorder.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - saleorder.create_time <= 输入.end_time - ENDOPTION - OPTION 输入.material <> "" - ( - material.material_code like 输入.material or - material.material_name like 输入.material or - material.material_spec like 输入.material - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls deleted file mode 100644 index 04d430d..0000000 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls and /dev/null differ diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 3ad5320..7ca716c 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -66,17 +66,10 @@ spring: wall: config: multi-statement-alagvslow: true - data: - mongodb: - host: 47.111.78.178 - port: 27017 - database: nlwms redis: #数据库索引 - database: ${REDIS_DB:1} host: ${REDIS_HOST:47.111.78.178} -# host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} password: ${REDIS_PWD:} #连接超时时间 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 59ed99d..d9faa99 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 @@ -55,14 +55,8 @@ spring: wall: config: multi-statement-alagvslow: true - data: - mongodb: - host: 192.168.46.225 - port: 27017 - database: nlacs redis: #数据库索引 - database: ${REDIS_DB:6} host: ${REDIS_HOST:192.168.46.225} #host: ${REDIS_HOST:localhost} diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml index 5dbcacb..eb5ed23 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml @@ -55,11 +55,6 @@ spring: wall: config: multi-statement-alagvslow: true - data: - mongodb: - host: 127.0.0.1 - port: 27017 - database: logdb redis: #数据库索引 database: ${REDIS_DB:8} diff --git a/mes/hd/nladmin-system/src/main/resources/initsql.txt b/mes/hd/nladmin-system/src/main/resources/initsql.txt deleted file mode 100644 index 16bafdc..0000000 --- a/mes/hd/nladmin-system/src/main/resources/initsql.txt +++ /dev/null @@ -1,14 +0,0 @@ -//初始化数据库sql -delete from acs_device_runpoint; -delete from acs_device_extra; -delete from acs_device; -delete from acs_opc_plc; -delete from acs_opc; -delete from acs_route_line; -delete from acs_instruction; -delete from acs_task; -delete from sys_log; -delete from sys_quartz_log; -delete from acs_storage_cell; -update acs_stage_actor set device_code='',image_name ='1'; -update sys_code_rule_detail set current_value=0; \ No newline at end of file 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 72d9e4c..d43d24c 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -47,12 +47,6 @@ https://juejin.cn/post/6844903775631572999 --> - - - info - - - diff --git a/mes/hd/新建文本文档.txt b/mes/hd/新建文本文档.txt deleted file mode 100644 index dd1ec20..0000000 --- a/mes/hd/新建文本文档.txt +++ /dev/null @@ -1 +0,0 @@ -132 \ No newline at end of file