From 2d2d3d3c74d92eb161c1d23eaba892609ed48b27 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 28 Jun 2023 09:17:26 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E9=A2=9D=E9=9D=A2=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/AcsTaskEnum.java | 8 +- .../org/nl/common/utils/OptionRecord.java | 6 +- .../java/org/nl/config/ConventConfig.java | 2 + .../config/thread/ThreadPoolExecutorUtil.java | 15 +- .../ext/acs/service/impl/AgvInstService.java | 18 +- .../MdPbStoragevehicleinfoController.java | 12 +- .../customer/MdCsCustomerbaseController.java | 73 ++++- .../IMdPbClassstandardService.java | 3 + .../impl/MdPbClassstandardServiceImpl.java | 21 +- .../customer/IMdCsCustomerbaseService.java | 5 + .../customer/dao/MdCsCustomerbase.java | 12 +- .../service/customer/dto/CustomerQuery.java | 23 ++ .../impl/MdCsCustomerbaseServiceImpl.java | 41 +++ .../IMdPbStoragevehicleinfoService.java | 59 ++++ .../service/vehicle/dto/VehicleQuery.java | 26 ++ .../MdPbStoragevehicleinfoServiceImpl.java | 95 +++++++ .../rest/CustomerbaseController.java | 67 ----- .../rest/MaterialbaseController.java | 2 +- .../service/CustomerbaseService.java | 64 ----- .../service/MaterialbaseService.java | 2 +- .../service/StoragevehicleinfoService.java | 78 ------ .../service/impl/CustomerbaseServiceImpl.java | 159 ----------- .../service/impl/MaterialbaseServiceImpl.java | 77 +++--- .../impl/StoragevehicleinfoServiceImpl.java | 236 ---------------- .../impl/StoragevehicleinfoServiceImpl2.java | 228 ++++++++++++++++ .../impl/CacheLineHandServiceImpl.java | 20 +- .../processroute}/ProcessrouteController.java | 37 ++- .../ProductprocessrouteController.java | 61 +++-- .../PdmBiWorkprocedureController.java | 44 +-- .../sch/tasks/SpeMachinery/SpeFullTask.java | 8 +- .../tasks/callEmpty/PlotterCallEmptyTask.java | 6 +- .../sendMaterial/PlotterSendMaterialTask.java | 9 +- .../IPdmBiProcessrouteService.java | 68 +++++ .../IPdmBiProcessroutedtlService.java | 18 ++ .../processroute/dao/PdmBiProcessroute.java | 120 +++++++++ .../dao/PdmBiProcessroutedtl.java | 55 ++++ .../dao/mapper/PdmBiProcessrouteMapper.java | 21 ++ .../mapper/PdmBiProcessroutedtlMapper.java | 16 ++ .../mapper/xml/PdmBiProcessrouteMapper.xml | 15 ++ .../mapper/xml/PdmBiProcessroutedtlMapper.xml | 5 + .../processroute/dto/ProcessrouteQuery.java | 30 +++ .../impl/PdmBiProcessrouteServiceImpl.java | 200 ++++++++++++++ .../impl/PdmBiProcessroutedtlServiceImpl.java | 20 ++ .../IPdmBiProductprocessrouteService.java | 79 ++++++ .../IPdmBiProductprocessroutedtlService.java | 16 ++ .../dao/PdmBiProductprocessroute.java | 120 +++++++++ .../dao/PdmBiProductprocessroutedtl.java | 55 ++++ .../PdmBiProductprocessrouteMapper.java | 25 ++ .../PdmBiProductprocessroutedtlMapper.java | 16 ++ .../xml/PdmBiProductprocessrouteMapper.xml | 50 ++++ .../xml/PdmBiProductprocessroutedtlMapper.xml | 5 + .../PdmBiProductprocessrouteServiceImpl.java | 199 ++++++++++++++ ...dmBiProductprocessroutedtlServiceImpl.java | 20 ++ .../impl/IPdmProduceWorkorderServiceImpl.java | 28 +- .../IPdmBiWorkprocedureService.java | 5 + .../workprocedure/dto/WorkprocedureQuery.java | 25 ++ .../impl/PdmBiWorkprocedureServiceImpl.java | 39 +++ .../service/ProcessrouteService.java | 100 ------- .../service/ProductprocessrouteService.java | 77 ------ .../service/impl/ProcessrouteServiceImpl.java | 246 ----------------- .../impl/ProductprocessrouteServiceImpl.java | 253 ------------------ .../备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql | 145 ---------- .../备份pdm/wql/QP_BI_PROCESSROUTE01.wql | 93 ------- .../xml/SchCachelineVehilematerialMapper.xml | 4 +- .../service/quartz/utils/ExecutionJob.java | 8 +- mes/qd/src/layout/components/Sidebar/Logo.vue | 2 +- mes/qd/src/views/login.vue | 2 +- .../master/measure/index.vue | 31 +-- .../master/storagevehicleinfo/index.vue | 8 +- .../pdm/workProcedure/index.vue | 6 - .../wms/pdm/base/productRoute/AddDialog.vue | 34 ++- 71 files changed, 2064 insertions(+), 1712 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dto/CustomerQuery.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dto/VehicleQuery.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl2.java rename mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/{备份pdm/rest => controller/processroute}/ProcessrouteController.java (65%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/{备份pdm/rest => controller/productProcessRoute}/ProductprocessrouteController.java (50%) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessrouteService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessroutedtlService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroute.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroutedtl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessrouteMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessroutedtlMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessrouteMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessroutedtlMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dto/ProcessrouteQuery.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessroutedtlServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessrouteService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessroutedtlService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroutedtl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessrouteMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessroutedtlMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessrouteMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessroutedtlMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessroutedtlServiceImpl.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/dto/WorkprocedureQuery.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index fb7fd6dd..3d99f488 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -50,12 +50,12 @@ public enum AcsTaskEnum { REQUEST_CALLTYPE_FULL("2","专机满料请求"), REQUEST_CALLTYPE_EMP("1","专机缺料请求"), REQUEST_PLOTTER_SEND_FULL("3","刻字满料请求"), - REQUEST_PLOTTER_CALL_EMP("4","刻字缺空框请求"), - REQUEST_PLOTTER_CALL_MATERIAL("9","刻字叫料请求"), + REQUEST_PLOTTER_CALL_EMP("4","刻字空框请求"), + REQUEST_PLOTTER_CALL_MATERIAL("9","刻字叫料请求"),//由mes下发 REQUEST_WARP_CALL_FULL("5","包装缺料请求"), REQUEST_WARP_SEND_EMP("6","包装送空框请求"), - REQUEST_WASH_EMP("7","清洗机器上料请求"), - REQUEST_WASH_FULL("8","清洗机器下料请求"), + REQUEST_WASH_EMP("7","清洗机器缺料请求"), + REQUEST_WASH_FULL("8","清洗机器满料请求"), // diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java index d5b3404e..ad950d05 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/OptionRecord.java @@ -14,7 +14,10 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.system_manage.service.ql.IPdmQlOptionService; import org.nl.wms.system_manage.service.ql.dao.PdmQlOption; import org.nl.wms.system_manage.service.ql.dto.OptionRecordQuery; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,8 +30,6 @@ import java.util.concurrent.ThreadPoolExecutor; */ public class OptionRecord { - private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); - public static void record(OptionEnum type,String status, Buss classname, String order, T option){ IPdmQlOptionService bean = SpringContextHolder.getBean(IPdmQlOptionService.class); PdmQlOption qlOption = new PdmQlOption(); @@ -45,6 +46,7 @@ public class OptionRecord { bean.save(qlOption); } public static void recordAsync(OptionEnum type,String status, Buss classname, String order, T option){ + ThreadPoolExecutor EXECUTOR = SpringContextHolder.getBean("meshandlerPool"); EXECUTOR.execute(()->{ record(type,status,classname,order,option); }); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java index 9661d05b..e986224f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java @@ -8,6 +8,7 @@ import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl; import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeEmpTask; import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeFullTask; import org.nl.wms.product_manage.sch.tasks.WashMachineryTask; +import org.nl.wms.product_manage.sch.tasks.callEmpty.PlotterCallEmptyTask; import org.nl.wms.product_manage.sch.tasks.callMaterial.WrapCallMaterialTask; import org.nl.wms.product_manage.sch.tasks.sendEmpty.WrapSendEmptyTask; import org.nl.wms.product_manage.sch.tasks.callMaterial.PlotterCallMaterialTask; @@ -26,6 +27,7 @@ public class ConventConfig implements SmartLifecycle { AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_CALLTYPE_EMP, SpringContextHolder.getBean(SpeEmpTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WASH_EMP, SpringContextHolder.getBean(WashMachineryTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_SEND_FULL, SpringContextHolder.getBean(PlotterSendMaterialTask.class)); + AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_CALL_EMP, SpringContextHolder.getBean(PlotterCallEmptyTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_PLOTTER_CALL_MATERIAL, SpringContextHolder.getBean(PlotterCallMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_CALL_FULL, SpringContextHolder.getBean(WrapCallMaterialTask.class)); AcsToWmsServiceImpl.Task_Collent.put(AcsTaskEnum.REQUEST_WARP_SEND_EMP, SpringContextHolder.getBean(WrapSendEmptyTask.class)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java index 5624f545..20d9b853 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java @@ -16,6 +16,8 @@ package org.nl.config.thread; import org.nl.modules.wql.util.SpringContextHolder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -26,16 +28,17 @@ import java.util.concurrent.TimeUnit; * @author Zheng Jie * @date 2019年10月31日18:16:47 */ +@Configuration public class ThreadPoolExecutorUtil { - public static ThreadPoolExecutor getPoll(){ - AsyncTaskProperties properties = SpringContextHolder.getBean(AsyncTaskProperties.class); + @Bean(name = "meshandlerPool") + public ThreadPoolExecutor meshandlerPool(){ return new ThreadPoolExecutor( - properties.getCorePoolSize(), - properties.getMaxPoolSize(), - properties.getKeepAliveSeconds(), + 8, + 32, + 30, TimeUnit.SECONDS, - new ArrayBlockingQueue<>(properties.getQueueCapacity()), + new ArrayBlockingQueue<>(128), new TheadFactoryName() ); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java index b620cb2a..7b8deaeb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java @@ -76,7 +76,7 @@ public class AgvInstService { String quantity = task.getString("material_qty"); //获取当前生产工序下一道工序 Map workprodure = basePointService.findDeviceWorkprodure(task.getString("point_code1")); - FlowElement currentFlow = getFlowElement(task, workprodure); + FlowElement currentFlow = getFlowElement(task.getString("point_code1"),task.getString("material_id"), workprodure); FlowElement next = currentFlow.next(); Map query = MapOf.of("workprocedure_id", basePointService.getWorkprodureByCode(next.getId()).get("workprocedure_id") , "qty", quantity,"spec",workprodure.get("spec")); @@ -141,12 +141,10 @@ public class AgvInstService { ; - public FlowElement getFlowElement(JSONObject task,Map workprodure){ + public FlowElement getFlowElement(String point_code,String material_id,Map workprodure){ if (CollectionUtils.isEmpty(workprodure)){ throw new BadRequestException("当前点位所属设备无对应工序"); } - String point_code = task.getString("point_code1"); - String material_id = task.getString("material_id"); SchBasePoint devicePoint = basePointService.getOne(new QueryWrapper() .eq("point_code", point_code) .eq("is_delete", "0") @@ -170,9 +168,11 @@ public class AgvInstService { public void empMatter(JSONObject task){ //参数 String startPoint = task.getString("point_code1"); - - PdmProduceWorkorder tmp_workorder = workorderService.getOne(new QueryWrapper().eq("workorder_code", task.getString("table_fk_id"))); - Map cacheVehile = getCacheVehile(startPoint, task.getString("material_id"),tmp_workorder.getWorkprocedure_id()); + //获取当前生产工序上一道工序 + Map workprodure = basePointService.findDeviceWorkprodure(task.getString("point_code2")); + FlowElement currentFlow = getFlowElement(task.getString("point_code2"),task.getString("material_id"), workprodure); + FlowElement pre = currentFlow.pre(); + Map cacheVehile = getCacheVehile(startPoint, task.getString("material_id"),pre.getId()); if (CollectionUtils.isEmpty(cacheVehile)) { throw new BadRequestException("缓存线："+startPoint+"没有物料"+task.getString("material_id")+"对应可用载具"); } @@ -199,12 +199,12 @@ public class AgvInstService { } - public Map getCacheVehile(String cacheLine, String materialId,String workprocedure_id){ + public Map getCacheVehile(String cacheLine, String materialId,String workprocedure_code){ Map map = new HashMap<>(); if (StringUtils.isNotEmpty(cacheLine)){ int count = taskService.count(new QueryWrapper().eq("point_code2", cacheLine).lt("task_status", StatusEnum.TASK_FINISH.getCode())); String status = StringUtils.isBlank(materialId) ? StatusEnum.CACHE_VEL_EMT.getCode() : StatusEnum.CACHE_VEL_FULL.getCode(); - List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId,"workprocedure_id",workprocedure_id, "cacheLine", cacheLine)); + List vehicle = cachelineVehicleService.getCachelineVehicle(MapOf.of("vehicle_status", status, "material_id", materialId,"workprocedure_code",workprocedure_code, "cacheLine", cacheLine)); if (vehicle.size()>0){ if (vehicle.size()>count){ return vehicle.stream().collect(HashMap::new, (k, v) -> k.put(v.getVehicle_code(), String.valueOf(v.getQuantity())), HashMap::putAll); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java index 76eeca89..50f4e48e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java @@ -3,11 +3,11 @@ package org.nl.wms.masterdata_manage.controller.vehicle; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; -import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService; -import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; +import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery; import org.nl.wms.storage_manage.productmanage.service.check.dto.CheckQueryMst; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -31,7 +31,7 @@ import java.util.Map; public class MdPbStoragevehicleinfoController { @Autowired - private StoragevehicleinfoService storagevehicleinfoService; + private IMdPbStoragevehicleinfoService storagevehicleinfoService; @Autowired private IMdPbStoragevehicleinfoService istoragevehicleinfoService; @@ -49,8 +49,8 @@ public class MdPbStoragevehicleinfoController { @GetMapping @Log("查询载具") @ApiOperation("查询载具") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(storagevehicleinfoService.queryAll(whereJson,page),HttpStatus.OK); + public ResponseEntity query(VehicleQuery whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(storagevehicleinfoService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @@ -64,7 +64,7 @@ public class MdPbStoragevehicleinfoController { @Log("修改载具") @ApiOperation("修改载具") //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") - public ResponseEntity update(@Validated @RequestBody StoragevehicleinfoDto dto){ + public ResponseEntity update(@Validated @RequestBody JSONObject dto){ storagevehicleinfoService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java index 4392220a..1deb9f7b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java @@ -1,21 +1,72 @@ + package org.nl.wms.masterdata_manage.master.controller.customer; -import org.springframework.web.bind.annotation.RequestMapping; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; +import org.nl.wms.masterdata_manage.master.service.customer.dto.CustomerQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; +import java.util.Map; /** - *

- * 客户基本信息表 前端控制器 - *

- * - * @author generator - * @since 2023-06-25 - */ + * @author ldjun + * @date 2021-12-06 + **/ @RestController -@RequestMapping("/mdCsCustomerbase") +@RequiredArgsConstructor +@Api(tags = "客户基础表管理") +@RequestMapping("/api/customerbase") +@Slf4j public class MdCsCustomerbaseController { -} + @Autowired + private IMdCsCustomerbaseService icustomerbaseService; + + @GetMapping + @Log("查询客户基础表") + @ApiOperation("查询客户基础表") + public ResponseEntity query(CustomerQuery whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(icustomerbaseService.page(page.build(), whereJson.build())), HttpStatus.OK); + } + + @PostMapping + @Log("新增客户基础表") + @ApiOperation("新增客户基础表") + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { + icustomerbaseService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改客户基础表") + @ApiOperation("修改客户基础表") + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { + icustomerbaseService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除客户基础表") + @ApiOperation("删除客户基础表") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length>0) { + icustomerbaseService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java index e5fdf2f3..a30236fa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java @@ -6,6 +6,7 @@ import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassst import java.util.List; import java.util.Map; +import java.util.Set; /** *

@@ -62,4 +63,6 @@ public interface IMdPbClassstandardService extends IService { * @return */ List getChildIdStr(String class_id); + + Set getAllChildIdSet(String class_idStr); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java index 52e25d0e..eb19ac12 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java @@ -152,7 +152,7 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl().eq("class_code", form.getString("class_code"))); - if (onebycode != null) { - throw new BadRequestException("存在相同的供应商编号"); - } if (form.getString("parent_class_id") != null && form.getString("class_id").equals(form.getString("parent_class_id"))) { throw new BadRequestException("上级不能为自己"); } @@ -217,7 +213,9 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl top_parent = collect.remove(id); - this.getChildTree(top_parent, collect, removeCollect); + if (!CollectionUtils.isEmpty(top_parent)){ + this.getChildTree(top_parent, collect, removeCollect); + } } if (!CollectionUtils.isEmpty(removeCollect)){ this.update(new UpdateWrapper() @@ -254,4 +252,15 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl getAllChildIdSet(String class_idStr) { + List class_ids = this.list(new QueryWrapper().in("class_id", class_idStr)); + Set set = new HashSet<>(); + set.add(class_idStr); + for (MdPbClassstandard classstandard : class_ids) { + set.addAll(this.getChildIdStr(classstandard.getClass_id())); + } + return set; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java index c0b3434c..335bea76 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/IMdCsCustomerbaseService.java @@ -1,5 +1,6 @@ package org.nl.wms.masterdata_manage.master.service.customer; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; import com.baomidou.mybatisplus.extension.service.IService; @@ -13,4 +14,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IMdCsCustomerbaseService extends IService { + void create(JSONObject dto); + + void update(JSONObject dto); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java index 38db9561..4dffd1c1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dao/MdCsCustomerbase.java @@ -1,5 +1,6 @@ package org.nl.wms.masterdata_manage.master.service.customer.dao; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; @@ -23,7 +24,8 @@ public class MdCsCustomerbase implements Serializable { /** * 客户标识 */ - private Long cust_id; + @TableId(value = "cust_id") + private String cust_id; /** * 客户编码 @@ -31,7 +33,7 @@ public class MdCsCustomerbase implements Serializable { private String cust_code; /** - * 客户名称 + * 客户名称 */ private String cust_name; @@ -83,7 +85,7 @@ public class MdCsCustomerbase implements Serializable { /** * 创建人 */ - private Long create_id; + private String create_id; /** * 创建人姓名 @@ -98,7 +100,7 @@ public class MdCsCustomerbase implements Serializable { /** * 修改人 */ - private Long update_id; + private String update_id; /** * 修改人姓名 @@ -138,7 +140,7 @@ public class MdCsCustomerbase implements Serializable { /** * 分类标识 */ - private Long class_id; + private String class_id; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dto/CustomerQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dto/CustomerQuery.java new file mode 100644 index 00000000..3c1cc1dd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/dto/CustomerQuery.java @@ -0,0 +1,23 @@ +package org.nl.wms.masterdata_manage.master.service.customer.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; + +/* + * @author ZZQ + * @Date 2023/5/14 17:13 + */ +@Data +public class CustomerQuery extends BaseQuery { + + private String search; + + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"cust_code","cust_name"}).type(QueryTEnum.LK).build()); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java index 71ee6956..97628d92 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java @@ -1,10 +1,25 @@ package org.nl.wms.masterdata_manage.master.service.customer.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; +import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard; import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; import org.nl.wms.masterdata_manage.master.service.customer.dao.mapper.MdCsCustomerbaseMapper; import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto; +import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** *

@@ -17,4 +32,30 @@ import org.springframework.stereotype.Service; @Service public class MdCsCustomerbaseServiceImpl extends ServiceImpl implements IMdCsCustomerbaseService { + + @Override + public void create(JSONObject dto) { + Assert.notNull(dto,"请求参数不能为空"); + String cust_code = dto.getString("cust_code"); + MdCsCustomerbase custCode = this.getOne(new QueryWrapper().eq("cust_code", cust_code)); + if (custCode != null) { + throw new BadRequestException("存在相同的客户编号"); + } + MdCsCustomerbase entity = dto.toJavaObject(MdCsCustomerbase.class); + entity.setCust_id(org.nl.common.utils.IdUtil.getStringId()); + entity.setCreate_id(SecurityUtils.getCurrentUserId()); + entity.setCreate_name(SecurityUtils.getCurrentNickName()); + entity.setCreate_time(DateUtil.now()); + this.save(entity); + } + + @Override + public void update(JSONObject dto) { + + MdCsCustomerbase entity = dto.toJavaObject(MdCsCustomerbase.class); + entity.setUpdate_id(SecurityUtils.getCurrentUserId()); + entity.setUpdate_name(SecurityUtils.getCurrentNickName()); + entity.setUpdate_time(DateUtil.now()); + this.updateById(entity); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java index cc2df164..c1ef407b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java @@ -2,9 +2,15 @@ package org.nl.wms.masterdata_manage.service.vehicle; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery; +import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; +import org.springframework.data.domain.Pageable; +import java.util.List; import java.util.Map; /** @@ -31,4 +37,57 @@ public interface IMdPbStoragevehicleinfoService extends IService + */ + Page queryAll(VehicleQuery query, PageQuery page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param storagevehicle_id ID + * @return MdPbStoragevehicleinfo + */ + Object findById(Long storagevehicle_id); + + /** + * 根据编码查询 + * @param code code + * @return MdPbStoragevehicleinfo + */ + Object findByCode(String code); + + /** + * 编辑 + * @param dto / + */ + void update(JSONObject dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); + + /** + * 多修改启用状态 + * @param json / + */ + void changeActive(JSONObject json); + + /** + * 获取起始载具号 + * @param code / + */ + JSONObject getVehicle(String code); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dto/VehicleQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dto/VehicleQuery.java new file mode 100644 index 00000000..f6cdd116 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dto/VehicleQuery.java @@ -0,0 +1,26 @@ +package org.nl.wms.masterdata_manage.service.vehicle.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class VehicleQuery extends BaseQuery { + + private String storagevehicle_code_begin; + private String storagevehicle_code_end; + private String storagevehicle_type; + + @Override + public void paramMapping() { + super.doP.put("storagevehicle_code_begin", QParam.builder().k(new String[]{"storagevehicle_code"}).type(QueryTEnum.LT).build()); + super.doP.put("storagevehicle_code_end", QParam.builder().k(new String[]{"storagevehicle_code"}).type(QueryTEnum.LE).build()); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java index 6d534bde..254d7341 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -4,16 +4,22 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.map.MapUtil; 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.service.impl.GenCodeServiceImpl; import org.nl.modules.system.util.CodeUtil; +import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; @@ -21,12 +27,16 @@ import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicleinfoMapper; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery; import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -129,4 +139,89 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl queryAll(Map whereJson) { + List list = this.list(); + return list; + } + + @Override + public Object findById(Long storagevehicle_id) { + return this.getOne(new QueryWrapper().eq("storagevehicle_id",storagevehicle_id)); + } + + @Override + public Object findByCode(String code) { + return this.getOne(new QueryWrapper().eq("storagevehicle_code",code)); + } + + + @Override + public void update(JSONObject dto) { + Object byCode = this.findByCode(dto.getString("storagevehicle_code")); + if (!ObjectUtil.isEmpty(byCode)) { + throw new BadRequestException("此载具已存在"); + } + MdPbStoragevehicleinfo entity = dto.toJavaObject(MdPbStoragevehicleinfo.class); + this.updateById(entity); + } + + @Override + public void deleteAll(Long[] ids) { + if (ids.length>0){ + this.removeByIds(Arrays.asList(ids)); + } + } + + @Override + public void changeActive(JSONObject json) { + + MdPbStoragevehicleinfo entity = json.toJavaObject(MdPbStoragevehicleinfo.class); + entity.setUpdate_id(SecurityUtils.getCurrentUserId()); + entity.setUpdate_time(DateUtil.now()); + entity.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(entity); + } + + @Override + public JSONObject getVehicle(String code) { + String term = ""; + switch (code) { + case "00": + term = "VEHICCLE_CODE_XMTPT"; + break; + case "01": + term = "VEHICCLE_CODE_CDMTP"; + break; + case "02": + term = "VEHICCLE_CODE_TLD"; + break; + case "03": + term = "VEHICCLE_CODE_TTP"; + break; + case "04": + term = "VEHICCLE_CODE_XMTPC"; + break; + case "05": + term = "VEHICCLE_CODE_LX"; + break; + } + + HashMap map = new HashMap<>(); + map.put("code", term); + map.put("flag", "0"); + GenCodeServiceImpl genCodeService = new GenCodeServiceImpl(); + String value = genCodeService.codeDemo(map); + + JSONObject json = new JSONObject(); + json.put("value", value); + return json; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java deleted file mode 100644 index f848a2e5..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java +++ /dev/null @@ -1,67 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.masterdata_manage.备份master.service.CustomerbaseService; -import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto; -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 ldjun - * @date 2021-12-06 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "客户基础表管理") -@RequestMapping("/api/customerbase") -@Slf4j -public class CustomerbaseController { - - private final CustomerbaseService customerbaseService; - - @GetMapping - @Log("查询客户基础表") - @ApiOperation("查询客户基础表") - //@PreAuthorize("@el.check('customerbase:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(customerbaseService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增客户基础表") - @ApiOperation("新增客户基础表") - //@PreAuthorize("@el.check('customerbase:add')") - public ResponseEntity create(@Validated @RequestBody CustomerbaseDto dto) { - customerbaseService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改客户基础表") - @ApiOperation("修改客户基础表") - //@PreAuthorize("@el.check('customerbase:edit')") - public ResponseEntity update(@Validated @RequestBody CustomerbaseDto dto) { - customerbaseService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除客户基础表") - @ApiOperation("删除客户基础表") - //@PreAuthorize("@el.check('customerbase:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - customerbaseService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java index 61740bb4..6904fa19 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java @@ -54,7 +54,7 @@ public class MaterialbaseController { @Log("修改物料") @ApiOperation("修改物料") //@PreAuthorize("@el.check('Materialbase:edit')") - public ResponseEntity update(@Validated @RequestBody MaterialbaseDto dto) { + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { materialBaseService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java deleted file mode 100644 index e395f5c5..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java +++ /dev/null @@ -1,64 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.service; - -import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @description 服务接口 - * @author ldjun - * @date 2021-12-06 - **/ -public interface CustomerbaseService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param cust_id ID - * @return Customerbase - */ - CustomerbaseDto findById(Long cust_id); - - /** - * 根据编码查询 - * @param code code - * @return Customerbase - */ - CustomerbaseDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(CustomerbaseDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(CustomerbaseDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java index 300b826f..2d386d5c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java @@ -62,7 +62,7 @@ public interface MaterialbaseService { * * @param dto / */ - void update(MaterialbaseDto dto); + void update(JSONObject dto); /** * 多选删除 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java deleted file mode 100644 index f43111df..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java +++ /dev/null @@ -1,78 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author ldjun -* @date 2021-12-09 -**/ -public interface StoragevehicleinfoService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param storagevehicle_id ID - * @return MdPbStoragevehicleinfo - */ - StoragevehicleinfoDto findById(Long storagevehicle_id); - - /** - * 根据编码查询 - * @param code code - * @return MdPbStoragevehicleinfo - */ - StoragevehicleinfoDto findByCode(String code); - - - /** - * 创建 - * @param map / - */ - JSONArray create(JSONObject map); - - /** - * 编辑 - * @param dto / - */ - void update(StoragevehicleinfoDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 多修改启用状态 - * @param json / - */ - void changeActive(JSONObject json); - - /** - * 获取起始载具号 - * @param code / - */ - JSONObject getVehicle(String code); -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java deleted file mode 100644 index b5cc3126..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.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.modules.common.exception.BadRequestException; - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; -import org.nl.wms.masterdata_manage.备份master.service.CustomerbaseService; -import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto; -import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto; - - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * @author ldjun - * @description 服务实现 - * @date 2021-12-06 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class CustomerbaseServiceImpl implements CustomerbaseService { - @Autowired - private ClassstandardService classstandardService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String where = ""; - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - String search = (String) whereJson.get("search"); - if (!StrUtil.isEmpty(search)) { - where = "AND (cust_code like '%" + search + "%' OR cust_name like '%" + search + "%')"; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete = '0'" + where, "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(CustomerbaseDto.class); - return list; - } - - @Override - public CustomerbaseDto findById(Long cust_id) { - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - JSONObject json = wo.query("cust_id =" + cust_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); - return obj; - } - - @Override - public CustomerbaseDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - JSONObject json = wo.query("cust_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final CustomerbaseDto obj = json.toJavaObject(CustomerbaseDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(CustomerbaseDto dto) { - String cust_code = dto.getCust_code(); - CustomerbaseDto customerbaseDto = this.findByCode(cust_code); - if (customerbaseDto != null && customerbaseDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的客户编号"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + ""); - dto.setClass_code(classDto.getClass_code()); - dto.setClass_name(classDto.getClass_name()); - dto.setCust_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - dto.setUpdate_time(DateUtil.now()); - dto.setCreate_time(DateUtil.now()); - - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(CustomerbaseDto dto) { - CustomerbaseDto entity = this.findById(dto.getCust_id()); - if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - - String cust_code = dto.getCust_code(); - CustomerbaseDto customerbaseDto = this.findByCode(cust_code); - if (customerbaseDto != null && !customerbaseDto.getCust_id().equals(dto.getCust_id()) && customerbaseDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的客户编号"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setUpdate_time(DateUtil.now()); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("md_cs_customerbase"); - for (Long cust_id : ids) { - JSONObject param = new JSONObject(); - param.put("cust_id", String.valueOf(cust_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java index b50de28a..e17110a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java @@ -20,6 +20,9 @@ import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; +import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; +import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum; @@ -27,14 +30,19 @@ import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService; import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto; import org.nl.wms.pda_manage.pda.dto.MaterialDto; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Pageable; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; /** * @author zhouz @@ -46,10 +54,18 @@ import java.util.concurrent.ThreadPoolExecutor; @Slf4j public class MaterialbaseServiceImpl implements MaterialbaseService{ private final ClassstandardService classstandardService; - //private final WmsToErpService wmsToErpService; + + @Resource + @Qualifier("meshandlerPool") + private ThreadPoolExecutor pool; + private final RedisUtils redisUtils; @Autowired private IMdMeMaterialbaseService materialbaseService; + @Autowired + private IMdPbClassstandardService iMdPbClassstandardService; + @Autowired + private IMdPbMeasureunitService mdPbMeasureunitService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -71,12 +87,12 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ //处理物料当前节点的所有子节点 if(!StrUtil.isEmpty(material_type_id)) { map.put("material_type_id", material_type_id); - String classIds = classstandardService.getChildIdStr(material_type_id); - map.put("classIds", classIds); + Set childIdStr = iMdPbClassstandardService.getAllChildIdSet(material_type_id); + map.put("classIds", "('"+childIdStr.stream().collect(Collectors.joining("','"))+"')"); } else if(ObjectUtil.isNotEmpty(class_idStr)) { - String classIds = classstandardService.getAllChildIdStr(class_idStr); - map.put("classIds", classIds); + List allChildIdSet = iMdPbClassstandardService.getChildIdStr(class_idStr); + map.put("classIds", "('"+allChildIdSet.stream().collect(Collectors.joining("','"))+"')"); } if(!StrUtil.isEmpty(class_code)) { map.put("class_code", class_code + "%"); @@ -113,34 +129,30 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ @Override public MaterialbaseDto findById(Long material_id) { - WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); - JSONObject json = wo.query("material_id =" + material_id + "").uniqueResult(0); - String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name"); - json.put("base_unit_name", unit_name); - final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); - return obj; + MdMeMaterialbase materialbase = materialbaseService.getOne(new QueryWrapper().eq("material_id", material_id)); + MdPbMeasureunit unit = mdPbMeasureunitService.getOne(new QueryWrapper().eq("measure_unit_id", materialbase.getBase_unit_id())); + MaterialbaseDto dto = new MaterialbaseDto(); + BeanUtils.copyProperties(materialbase,dto); + dto.setBase_unit_name(unit.getUnit_name()); + return dto; } @Override public MaterialbaseDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); if(StrUtil.isNotEmpty(code) && code.contains("\\")) { code = code.replace("\\", "\\\\"); } - JSONObject json = wo.query("material_code ='" + code + "'").uniqueResult(0); - if(ObjectUtil.isEmpty(json)) { - return null; - } - String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name"); - json.put("base_unit_name", unit_name); - final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); - return obj; + MdMeMaterialbase materialbase = materialbaseService.getOne(new QueryWrapper().eq("material_code", code)); + MdPbMeasureunit unit = mdPbMeasureunitService.getOne(new QueryWrapper().eq("measure_unit_id", materialbase.getBase_unit_id())); + MaterialbaseDto dto = new MaterialbaseDto(); + BeanUtils.copyProperties(materialbase,dto); + dto.setBase_unit_name(unit.getUnit_name()); + return dto; } @Override @Transactional(rollbackFor = Exception.class) public void create(MaterialbaseDto dto) { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId()); @@ -162,20 +174,13 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ @Override @Transactional(rollbackFor = Exception.class) - public void update(MaterialbaseDto dto) { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); - MaterialbaseDto entity = this.findById(dto.getMaterial_id()); - if(entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); - } - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - dto.setUpdate_time(DateUtil.now()); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); + public void update(JSONObject dto) { + + MdMeMaterialbase materialbase = dto.toJavaObject(MdMeMaterialbase.class); + materialbase.setUpdate_time(new Date()); + materialbase.setUpdate_id(SecurityUtils.getCurrentUserId()); + materialbase.setUpdate_name(SecurityUtils.getCurrentNickName()); + materialbaseService.updateById(materialbase); //子线程异步更新redis数据 CompletableFuture updateMaterToRedis = CompletableFuture.runAsync(this::updateRedis, pool); updateMaterToRedis.exceptionally((e) -> { @@ -186,7 +191,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); @@ -231,7 +235,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService{ @Override @Transactional(rollbackFor = Exception.class) public JSONObject synchronize(JSONObject form) { - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); log.info("导入方法开始"); JSONObject result = new JSONObject(); String url = "http://192.168.0.82:8000/sap/bc/srt/rfc/sap/z_sd0002_send_mat_md/800/z_sd0002_send_mat_md/binding"; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java deleted file mode 100644 index 0e47256c..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java +++ /dev/null @@ -1,236 +0,0 @@ - -package org.nl.wms.masterdata_manage.备份master.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.modules.common.exception.BadRequestException; - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.system.service.impl.GenCodeServiceImpl; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService; -import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; - -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 ldjun - * @description 服务实现 - * @date 2021-12-09 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin"); - String storagevehicle_code_end = (String) whereJson.get("storagevehicle_code_end"); - String storagevehicle_type = (String) whereJson.get("storagevehicle_type"); - - HashMap map = new HashMap(); - map.put("storagevehicle_code_begin", storagevehicle_code_begin); - map.put("storagevehicle_code_end", storagevehicle_code_end); - map.put("storagevehicle_type", storagevehicle_type); - map.put("flag", "1"); - JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.storagevehicle_code ASC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(StoragevehicleinfoDto.class); - return list; - } - - @Override - public StoragevehicleinfoDto findById(Long storagevehicle_id) { - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject json = wo.query("storagevehicle_id =" + storagevehicle_id + "").uniqueResult(0); - final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); - return obj; - } - - @Override - public StoragevehicleinfoDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject json = wo.query("storagevehicle_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)){ - throw new BadRequestException("请输入正确的载具号！"); - } - final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONArray create(JSONObject map) { - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonObject = wo.query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0); - if (!ObjectUtil.isEmpty(jsonObject)) { - throw new BadRequestException("此载具已存在"); - } - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - String storagevehicle_type = (String) map.get("storagevehicle_type"); - String code = ""; - switch (storagevehicle_type) { - case "00": - code = "VEHICCLE_CODE_XMTPT"; - break; - case "01": - code = "VEHICCLE_CODE_CDMTP"; - break; - case "02": - code = "VEHICCLE_CODE_TLD"; - break; - case "03": - code = "VEHICCLE_CODE_TTP"; - break; - case "04": - code = "VEHICCLE_CODE_XMTPC"; - break; - case "05": - code = "VEHICCLE_CODE_LX"; - break; - } - JSONArray resultCodeArr = new JSONArray(); - int num = MapUtil.getInt(map, "num"); - for (int i = 0; i < num; i++) { - StoragevehicleinfoDto dto = new StoragevehicleinfoDto(); - dto.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setStoragevehicle_code(CodeUtil.getNewCode(code)); - dto.setCreate_id(currentUserId); - dto.setStoragevehicle_name(dto.getStoragevehicle_code()); - dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - dto.setUpdate_time(DateUtil.now()); - dto.setCreate_time(DateUtil.now()); - dto.setStoragevehicle_type((String) map.get("storagevehicle_type")); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - resultCodeArr.add(dto.getStoragevehicle_code()); - } - return resultCodeArr; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(StoragevehicleinfoDto dto) { - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getStoragevehicle_code() + "' and is_delete = '0'").uniqueResult(0); - if (!ObjectUtil.isEmpty(jsonObject)) { - throw new BadRequestException("此载具已存在"); - } - StoragevehicleinfoDto entity = this.findById(dto.getStoragevehicle_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setUpdate_time(DateUtil.now()); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); - for (Long storagevehicle_id : ids) { - JSONObject param = new JSONObject(); - param.put("storagevehicle_id", String.valueOf(storagevehicle_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("md_pb_storagevehicleinfo").update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject getVehicle(String code) { - String term = ""; - switch (code) { - case "00": - term = "VEHICCLE_CODE_XMTPT"; - break; - case "01": - term = "VEHICCLE_CODE_CDMTP"; - break; - case "02": - term = "VEHICCLE_CODE_TLD"; - break; - case "03": - term = "VEHICCLE_CODE_TTP"; - break; - case "04": - term = "VEHICCLE_CODE_XMTPC"; - break; - case "05": - term = "VEHICCLE_CODE_LX"; - break; - } - - HashMap map = new HashMap<>(); - map.put("code", term); - map.put("flag", "0"); - GenCodeServiceImpl genCodeService = new GenCodeServiceImpl(); - String value = genCodeService.codeDemo(map); - - JSONObject json = new JSONObject(); - json.put("value", value); - return json; - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl2.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl2.java new file mode 100644 index 00000000..f941757a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl2.java @@ -0,0 +1,228 @@ +// +//package org.nl.wms.masterdata_manage.备份master.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.modules.common.exception.BadRequestException; +// import org.nl.common.utils.SecurityUtils; +//import org.nl.modules.system.service.impl.GenCodeServiceImpl; +//import org.nl.modules.system.util.CodeUtil; +//import org.nl.modules.wql.WQL; +//import org.nl.modules.wql.core.bean.WQLObject; +//import org.nl.modules.wql.util.WqlUtil; +//import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; +//import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; +//import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.data.domain.Pageable; +//import org.springframework.stereotype.Service; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.Arrays; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +///** +// * @author ldjun +// * @description 服务实现 +// * @date 2021-12-09 +// **/ +//@Service +//@RequiredArgsConstructor +//@Slf4j +//public class StoragevehicleinfoServiceImpl2 implements StoragevehicleinfoService { +// +// @Autowired +// private IMdPbStoragevehicleinfoService storagevehicleinfoService; +// +// @Override +// public Map queryAll(Map whereJson, Pageable page) { +// String storagevehicle_code_begin = (String) whereJson.get("storagevehicle_code_begin"); +// String storagevehicle_code_end = (String) whereJson.get("storagevehicle_code_end"); +// String storagevehicle_type = (String) whereJson.get("storagevehicle_type"); +// +// HashMap map = new HashMap(); +// map.put("storagevehicle_code_begin", storagevehicle_code_begin); +// map.put("storagevehicle_code_end", storagevehicle_code_end); +// map.put("storagevehicle_type", storagevehicle_type); +// map.put("flag", "1"); +// JSONObject json = WQL.getWO("QMD_PB_STORAGEVEHICLEINFO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.storagevehicle_code ASC"); +// return json; +// } +// +// @Override +// public List queryAll(Map whereJson) { +// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); +// JSONArray arr = wo.query().getResultJSONArray(0); +// List list = arr.toJavaList(StoragevehicleinfoDto.class); +// return list; +// } +// +// @Override +// public StoragevehicleinfoDto findById(Long storagevehicle_id) { +// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); +// JSONObject json = wo.query("storagevehicle_id =" + storagevehicle_id + "").uniqueResult(0); +// final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); +// return obj; +// } +// +// @Override +// public StoragevehicleinfoDto findByCode(String code) { +// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); +// JSONObject json = wo.query("storagevehicle_code ='" + code + "'").uniqueResult(0); +// if (ObjectUtil.isEmpty(json)){ +// throw new BadRequestException("请输入正确的载具号！"); +// } +// final StoragevehicleinfoDto obj = json.toJavaObject(StoragevehicleinfoDto.class); +// return obj; +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public JSONArray create(JSONObject map) { +// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); +// JSONObject jsonObject = wo.query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' and is_delete = '0'").uniqueResult(0); +// if (!ObjectUtil.isEmpty(jsonObject)) { +// throw new BadRequestException("此载具已存在"); +// } +// String currentUserId = SecurityUtils.getCurrentUserId(); +// String nickName = SecurityUtils.getCurrentNickName(); +// +// +// String storagevehicle_type = (String) map.get("storagevehicle_type"); +// String code = ""; +// switch (storagevehicle_type) { +// case "00": +// code = "VEHICCLE_CODE_XMTPT"; +// break; +// case "01": +// code = "VEHICCLE_CODE_CDMTP"; +// break; +// case "02": +// code = "VEHICCLE_CODE_TLD"; +// break; +// case "03": +// code = "VEHICCLE_CODE_TTP"; +// break; +// case "04": +// code = "VEHICCLE_CODE_XMTPC"; +// break; +// case "05": +// code = "VEHICCLE_CODE_LX"; +// break; +// } +// JSONArray resultCodeArr = new JSONArray(); +// int num = MapUtil.getInt(map, "num"); +// for (int i = 0; i < num; i++) { +// StoragevehicleinfoDto dto = new StoragevehicleinfoDto(); +// dto.setStoragevehicle_id(IdUtil.getSnowflake(1, 1).nextId()); +// dto.setStoragevehicle_code(CodeUtil.getNewCode(code)); +// dto.setCreate_id(currentUserId); +// dto.setStoragevehicle_name(dto.getStoragevehicle_code()); +// dto.setCreate_name(nickName); +// dto.setUpdate_id(currentUserId); +// dto.setUpdate_name(nickName); +// dto.setUpdate_time(DateUtil.now()); +// dto.setCreate_time(DateUtil.now()); +// dto.setStoragevehicle_type((String) map.get("storagevehicle_type")); +// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); +// wo.insert(json); +// resultCodeArr.add(dto.getStoragevehicle_code()); +// } +// return resultCodeArr; +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void update(StoragevehicleinfoDto dto) { +// WQLObject wo = WQLObject.getWQLObject("md_pb_storagevehicleinfo"); +// JSONObject jsonObject = wo.query("storagevehicle_code = '" + dto.getStoragevehicle_code() + "' and is_delete = '0'").uniqueResult(0); +// if (!ObjectUtil.isEmpty(jsonObject)) { +// throw new BadRequestException("此载具已存在"); +// } +// StoragevehicleinfoDto entity = this.findById(dto.getStoragevehicle_id()); +// if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); +// +// String currentUserId = SecurityUtils.getCurrentUserId(); +// String nickName = SecurityUtils.getCurrentNickName(); +// +// +// dto.setUpdate_time(DateUtil.now()); +// dto.setUpdate_id(currentUserId); +// dto.setUpdate_name(nickName); +// +// JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); +// wo.update(json); +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void deleteAll(Long[] ids) { +// if (ids.length>0){ +// storagevehicleinfoService.removeByIds(Arrays.asList(ids)); +// } +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public void changeActive(JSONObject json) { +// String is_used = "1"; +// if (StrUtil.equals("1", json.getString("is_used"))) { +// is_used = "0"; +// } +// MdPbStoragevehicleinfo entity = json.toJavaObject(MdPbStoragevehicleinfo.class); +// entity.setIs_used(is_used.equals("1")?true:false); +// entity.setUpdate_id(SecurityUtils.getCurrentUserId()); +// entity.setUpdate_time(DateUtil.now()); +// entity.setUpdate_name(SecurityUtils.getCurrentNickName()); +// storagevehicleinfoService.updateById(entity); +// } +// +// @Override +// @Transactional(rollbackFor = Exception.class) +// public JSONObject getVehicle(String code) { +// String term = ""; +// switch (code) { +// case "00": +// term = "VEHICCLE_CODE_XMTPT"; +// break; +// case "01": +// term = "VEHICCLE_CODE_CDMTP"; +// break; +// case "02": +// term = "VEHICCLE_CODE_TLD"; +// break; +// case "03": +// term = "VEHICCLE_CODE_TTP"; +// break; +// case "04": +// term = "VEHICCLE_CODE_XMTPC"; +// break; +// case "05": +// term = "VEHICCLE_CODE_LX"; +// break; +// } +// +// HashMap map = new HashMap<>(); +// map.put("code", term); +// map.put("flag", "0"); +// GenCodeServiceImpl genCodeService = new GenCodeServiceImpl(); +// String value = genCodeService.codeDemo(map); +// +// JSONObject json = new JSONObject(); +// json.put("value", value); +// return json; +// } +// +//} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java index 9336ac5f..2a52a3b8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java @@ -31,6 +31,8 @@ import org.nl.wms.pda_manage.pda.dto.MaterialDto; import org.nl.wms.pda_manage.pda.service.CacheLineHandService; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; +import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelinePositionService; import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelineVehilematerialService; import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelinePosition; @@ -41,11 +43,14 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.scheduler_manage.service.task.dao.mapper.SchBaseTaskMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadPoolExecutor; @@ -63,6 +68,11 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @Slf4j public class CacheLineHandServiceImpl implements CacheLineHandService { + + @Resource + @Qualifier("meshandlerPool") + private ThreadPoolExecutor pool; + private final RedisUtils redisUtils; @Autowired private LocalCache cache; @@ -73,6 +83,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { @Autowired private SchCachelineVehilematerialMapper vehilematerialMapper; @Autowired + private IPdmBiWorkprocedureService workprocedureService; + @Autowired private SchCachelinePositionMapper positionMapper; @Autowired private SchBaseTaskMapper taskMapper; @@ -111,7 +123,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { return WQL.getWO("PDA_QUERY").addParam("flag", "6").addParam("condition", param).process().getResultJSONArray(0).toJavaList(MaterialDto.class); } List materialList; - ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll(); + //12W种物料信息，查本地缓存 materialList = cache.get("hl:cacheLineHand:materialBase:mid"); if (null != materialList) { @@ -401,7 +413,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { String vehicle_code = param.getString("vehicle_code"); // 缓存线 String cacheLine_code = param.getString("wcsdevice_code"); - String workprocedure_id = param.getString("workprocedure_id"); + PdmBiWorkprocedure biWorkprocedure = workprocedureService.getOne(new QueryWrapper() + .eq("workprocedure_code", param.getString("workprocedure_code"))); String weight = param.getString("weight"); String quantity = param.getString("quantity"); @@ -434,7 +447,8 @@ public class CacheLineHandServiceImpl implements CacheLineHandService { json.put("material_id", mater.getMaterial_id()); json.put("weight", weight); json.put("quantity", quantity); - json.put("workprocedure_id", workprocedure_id); + json.put("workprocedure_id", biWorkprocedure.getWorkprocedure_id()); + json.put("workprocedure_code", biWorkprocedure.getWorkprocedure_code()); //有箱有料 json.put("vehicle_status", StatusEnum.CACHE_VEL_FULL.getCode()); json.put("create_time", DateUtil.now()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java similarity index 65% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java index 09905c69..f0d2da8f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java @@ -1,15 +1,17 @@ -package org.nl.wms.product_manage.备份pdm.rest; +package org.nl.wms.product_manage.controller.processroute; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService; -import org.springframework.data.domain.Pageable; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.product_manage.service.processroute.IPdmBiProcessrouteService; +import org.nl.wms.product_manage.service.processroute.dto.ProcessrouteQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -27,40 +29,37 @@ import java.util.Map; @Slf4j public class ProcessrouteController { - private final ProcessrouteService processrouteService; + + private final IPdmBiProcessrouteService iProcessrouteService; @GetMapping @Log("查询工艺路线") @ApiOperation("查询工艺路线") - //@PreAuthorize("@el.check('processroute:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(processrouteService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity query(ProcessrouteQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iProcessrouteService.page(page.build(),query.build())), HttpStatus.OK); } @PostMapping @Log("新增工艺路线") @ApiOperation("新增工艺路线") - //@PreAuthorize("@el.check('processroute:add')") public ResponseEntity create(@RequestBody JSONObject json) { - processrouteService.create(json); + iProcessrouteService.create(json); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改工艺路线") @ApiOperation("修改工艺路线") - //@PreAuthorize("@el.check('processroute:edit')") public ResponseEntity update(@RequestBody JSONObject whereJson) { - processrouteService.update(whereJson); + iProcessrouteService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除工艺路线") @ApiOperation("删除工艺路线") - //@PreAuthorize("@el.check('processroute:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { - processrouteService.deleteAll(ids); + iProcessrouteService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } @@ -68,21 +67,21 @@ public class ProcessrouteController { @ApiOperation("获取工序") @GetMapping("/getWorkList") public ResponseEntity getWorkList() { - return new ResponseEntity<>(processrouteService.getWorkList(), HttpStatus.OK); + return new ResponseEntity<>(iProcessrouteService.getWorkList(), HttpStatus.OK); } @Log("获取明细") @ApiOperation("获取明细") @GetMapping("/getDtl") public ResponseEntity getDtl(@RequestParam Map map) { - return new ResponseEntity<>(processrouteService.getDtl(map), HttpStatus.OK); + return new ResponseEntity<>(iProcessrouteService.getDtl(map), HttpStatus.OK); } @Log("提交") @ApiOperation("提交") @PutMapping("/submit") public ResponseEntity submit(@RequestBody JSONObject whereJson) { - processrouteService.submit(whereJson); + iProcessrouteService.submit(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @@ -90,7 +89,7 @@ public class ProcessrouteController { @ApiOperation("取消提交") @PutMapping("/CancelSubmit") public ResponseEntity CancelSubmit(@RequestBody JSONObject whereJson) { - processrouteService.CancelSubmit(whereJson); + iProcessrouteService.CancelSubmit(whereJson); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java similarity index 50% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java index 6e737c1e..1461ba8f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java @@ -1,19 +1,32 @@ -package org.nl.wms.product_manage.备份pdm.rest; +package org.nl.wms.product_manage.controller.productProcessRoute; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.wms.product_manage.service.processroute.IPdmBiProcessrouteService; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import org.nl.wms.product_manage.service.productProcessRoute.IPdmBiProductprocessrouteService; +import org.nl.wms.product_manage.service.productProcessRoute.IPdmBiProductprocessroutedtlService; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroute; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroutedtl; +import org.springframework.beans.factory.annotation.Autowired; 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.List; import java.util.Map; /** @@ -27,22 +40,29 @@ import java.util.Map; @Slf4j public class ProductprocessrouteController { - private final ProductprocessrouteService productprocessrouteService; + @Autowired + private IPdmBiProductprocessrouteService ipdmBiProductprocessrouteService; + @Autowired + private IPdmBiProductprocessroutedtlService iPdmBiProductprocessroutedtlService; + @Autowired + private IPdmBiProcessrouteService pdmBiProcessrouteService; @GetMapping @Log("查询产品工艺路线") @ApiOperation("查询产品工艺路线") - //@PreAuthorize("@el.check('productprocessroute:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(productprocessrouteService.queryAll(whereJson,page),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, Pageable pageQuery){ + Page page = PageHelper.startPage(pageQuery.getPageNumber() + 1, pageQuery.getPageSize()); + List list = ipdmBiProductprocessrouteService.queryAll(whereJson); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build,HttpStatus.OK); } @PostMapping @Log("新增产品工艺路线") @ApiOperation("新增产品工艺路线") - //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity create(@RequestBody Map whereJson){ - productprocessrouteService.create(whereJson); + ipdmBiProductprocessrouteService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -51,7 +71,7 @@ public class ProductprocessrouteController { @ApiOperation("修改产品工艺路线") //@PreAuthorize("@el.check('productprocessroute:edit')") public ResponseEntity update(@RequestBody Map whereJson){ - productprocessrouteService.update(whereJson); + ipdmBiProductprocessrouteService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -60,7 +80,7 @@ public class ProductprocessrouteController { //@PreAuthorize("@el.check('productprocessroute:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { - productprocessrouteService.deleteAll(ids); + ipdmBiProductprocessrouteService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } @@ -70,30 +90,33 @@ public class ProductprocessrouteController { @ApiOperation("获取工艺路线") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getRoute(@RequestBody Map whereJson) { - return new ResponseEntity<>(productprocessrouteService.getRoute(whereJson),HttpStatus.OK); + List list = pdmBiProcessrouteService.list(new QueryWrapper() + .eq("is_delete", "0").eq("processroute_status", 20)); + return new ResponseEntity<>(list,HttpStatus.OK); } @PostMapping("/getRouteDtl") @Log("获取工艺路线明细") @ApiOperation("获取工艺路线明细") - //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getRouteDtl(@RequestBody Map whereJson) { - return new ResponseEntity<>(productprocessrouteService.getRouteDtl(whereJson),HttpStatus.OK); + return new ResponseEntity<>(ipdmBiProductprocessrouteService.getRouteDtl(whereJson),HttpStatus.OK); } @PostMapping("/getProductRouteDtl") @Log("查询产品工艺路线明细") @ApiOperation("查询产品工艺路线明细") - //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getProductRouteDtl(@RequestBody Map whereJson) { - return new ResponseEntity<>(productprocessrouteService.getProductRouteDtl(whereJson),HttpStatus.OK); + JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); + List list = iPdmBiProductprocessroutedtlService.list(new QueryWrapper() + .eq("productprocess_id", jo.getString("productprocess_id"))); + return new ResponseEntity<>(list,HttpStatus.OK); } @Log("提交") @ApiOperation("提交") @PutMapping("/submit") public ResponseEntity submit(@RequestBody JSONObject whereJson) { - productprocessrouteService.submit(whereJson); + ipdmBiProductprocessrouteService.submit(whereJson); return new ResponseEntity<>(HttpStatus.OK); } @@ -101,7 +124,7 @@ public class ProductprocessrouteController { @ApiOperation("取消提交") @PutMapping("/unSubmit") public ResponseEntity unSubmit(@RequestBody JSONObject whereJson) { - productprocessrouteService.unSubmit(whereJson); + ipdmBiProductprocessrouteService.unSubmit(whereJson); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java index fff30c06..a3db2172 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java @@ -1,20 +1,32 @@ package org.nl.wms.product_manage.controller.workprocedure; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.masterdata_manage.备份pdm.service.WorkProcedureService; import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto; import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; +import org.nl.wms.product_manage.service.workprocedure.dto.WorkprocedureQuery; 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.Arrays; +import java.util.List; import java.util.Map; /** @@ -32,44 +44,38 @@ import java.util.Map; @Slf4j public class PdmBiWorkprocedureController { - private final WorkProcedureService workProcedureService; private final IPdmBiWorkprocedureService pdmBiWorkprocedureService; @GetMapping @Log("查询工序") @ApiOperation("查询工序") - //@PreAuthorize("@el.check('WorkProcedure:list')") - - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(workProcedureService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity query(WorkprocedureQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pdmBiWorkprocedureService.page(page.build(),query.build())), HttpStatus.OK); } @PostMapping @Log("新增工序") @ApiOperation("新增工序") - //@PreAuthorize("@el.check('WorkProcedure:add')") - - public ResponseEntity create(@Validated @RequestBody WorkProcedureDto dto) { - workProcedureService.create(dto); + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { + pdmBiWorkprocedureService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改工序") @ApiOperation("修改工序") - //@PreAuthorize("@el.check('WorkProcedure:edit')") - - public ResponseEntity update(@Validated @RequestBody WorkProcedureDto dto) { - workProcedureService.update(dto); + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { + pdmBiWorkprocedureService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除工序") @ApiOperation("删除工序") - //@PreAuthorize("@el.check('WorkProcedure:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { - workProcedureService.deleteAll(ids); + if (ids.length>0){ + pdmBiWorkprocedureService.removeByIds(Arrays.asList(ids)); + } return new ResponseEntity<>(HttpStatus.OK); } @@ -80,11 +86,13 @@ public class PdmBiWorkprocedureController { return new ResponseEntity<>(pdmBiWorkprocedureService.downSelect(), HttpStatus.OK); } @GetMapping("/queryWorkprocedure") - @Log("查询生产工序") + @Log("查询生产工序")//仓储/清洗 @ApiOperation("查询生产工序") - //@PreAuthorize("@el.check('workprocedure:list')") public ResponseEntity queryWorkprocedure() { - return new ResponseEntity<>(workProcedureService.queryWorkprocedure(), HttpStatus.OK); + List list = pdmBiWorkprocedureService.list(new QueryWrapper() + .eq("is_used", true) + .in("workprocedure_code", "A1_SKQX", "A1_CC")); + return new ResponseEntity<>(list, HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index c1ac69ab..bebffa92 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -27,6 +27,8 @@ import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; +import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelineVehilematerialService; import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelineVehilematerial; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; @@ -62,6 +64,8 @@ public class SpeFullTask extends AbstractAcsTask { @Autowired private ISchCachelineVehilematerialService cacheLineVechileService; @Autowired + private IPdmBiWorkprocedureService workprocedureService; + @Autowired private AgvInstService agvInstService; private final Map SpeHandles= new HashMap<>(); @@ -220,6 +224,7 @@ public class SpeFullTask extends AbstractAcsTask { cacheLineVechileService.removeByIds(list.stream().map(SchCachelineVehilematerial::getVehmaterial_id).collect(Collectors.toList())); } PdmProduceWorkorder workorder = workorderService.getOne(new QueryWrapper().eq("workorder_code", task.getTable_fk_id())); + PdmBiWorkprocedure workprocedure = workprocedureService.getOne(new QueryWrapper().eq("workprocedure_id", workorder.getWorkprocedure_id())); SchCachelineVehilematerial vehilematerial = new SchCachelineVehilematerial(); vehilematerial.setCreate_time(DateUtil.now()); vehilematerial.setVehmaterial_id(IdUtil.getStringId()); @@ -229,7 +234,8 @@ public class SpeFullTask extends AbstractAcsTask { vehilematerial.setCacheLine_code(task.getPoint_code1()); vehilematerial.setMaterial_id(task.getMaterial_id()); vehilematerial.setQuantity(task.getMaterial_qty()); - vehilematerial.setWorkprocedure_code(workorder.getWorkprocedure_id()); + vehilematerial.setWorkprocedure_code(workprocedure.getWorkprocedure_code()); + vehilematerial.setWorkprocedure_id(workprocedure.getWorkprocedure_id()); cacheLineVechileService.save(vehilematerial); } break; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/callEmpty/PlotterCallEmptyTask.java index 2fe8a471..0a58917d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -98,7 +98,11 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code"))); //?刻字满料请求：可以存在多个任务？ List list = taskService.list(new QueryWrapper() - .eq("point_code1", param.getString("device_code")).lt("task_status", StatusEnum.TASK_FINISH.getCode()) + .lt("task_status", StatusEnum.TASK_FINISH.getCode()) + .and(wa->wa + .eq("point_code1", param.getString("device_code")) + .or() + .eq("point_code2", param.getString("device_code"))) ); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index fc16c3ad..254e015a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -96,8 +96,12 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code"))); //?刻字满料请求：可以存在多个任务？ List list = taskService.list(new QueryWrapper() - .eq("point_code1", param.getString("device_code")).lt("task_status", StatusEnum.TASK_FINISH.getCode()) - ); + .lt("task_status", StatusEnum.TASK_FINISH.getCode()) + .and(wa->wa + .eq("point_code1", param.getString("device_code")) + .or() + .eq("point_code2", param.getString("device_code"))) + ); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } @@ -160,6 +164,7 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { // 去刻字缓存区寻找空位 List list = pointService.list(new QueryWrapper().isNull("vehicle_code") .eq("is_used", "1") + .eq("region_code","A1_KZHC") .eq("lock_type", StatusEnum.LOCK_OFF.getCode())); if (ObjectUtil.isNotEmpty(list)) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessrouteService.java new file mode 100644 index 00000000..eae574ac --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessrouteService.java @@ -0,0 +1,68 @@ +package org.nl.wms.product_manage.service.processroute; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 工艺路线主表 服务类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface IPdmBiProcessrouteService extends IService { + /** + * 创建 + * + * @param json / + */ + void create(JSONObject json); + + /** + * 编辑 + * + * @param whereJson / + */ + void update(JSONObject whereJson); + + /** + * 多选删除 + * + * @param ids / + */ + void deleteAll(Long[] ids); + + /** + * 获取工序 + */ + JSONArray getWorkList(); + + /** + * 提交 + * + * @param whereJson / + */ + void submit(JSONObject whereJson); + + /** + * 取消提交 + * + * @param whereJson / + */ + void CancelSubmit(JSONObject whereJson); + + + /** + * 获取明细 + * + * @param map / + * @return + */ + List getDtl(Map map); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessroutedtlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessroutedtlService.java new file mode 100644 index 00000000..4bcd5051 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/IPdmBiProcessroutedtlService.java @@ -0,0 +1,18 @@ +package org.nl.wms.product_manage.service.processroute; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroutedtl; + +/** + *

+ * 工艺路线主表 服务类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface IPdmBiProcessroutedtlService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroute.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroute.java new file mode 100644 index 00000000..a75ff4ca --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroute.java @@ -0,0 +1,120 @@ +package org.nl.wms.product_manage.service.processroute.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 工艺路线主表 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_processroute") +public class PdmBiProcessroute implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 工艺路线标识 + */ + private String processroute_id; + + /** + * 工艺路线编码 + */ + private String processroute_code; + + /** + * 工艺路线名称 + */ + private String processroute_name; + + /** + * 状态 + */ + private String processroute_status; + + /** + * 明细数 + */ + private BigDecimal detail_count; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 审核人 + */ + private String audit_id; + + /** + * 审核人姓名 + */ + private String audit_name; + + /** + * 审核时间 + */ + private String audit_time; + + /** + * 部门ID + */ + private String sysdeptid; + + /** + * 公司ID + */ + private String syscompanyid; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroutedtl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroutedtl.java new file mode 100644 index 00000000..9a8759da --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/PdmBiProcessroutedtl.java @@ -0,0 +1,55 @@ +package org.nl.wms.product_manage.service.processroute.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 工艺路线明细表 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_processroutedtl") +public class PdmBiProcessroutedtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 工艺路线明细标识 + */ + private String processroutedtl_id; + + /** + * 工艺路线标识 + */ + private String processroute_id; + + /** + * 工序顺序号 + */ + private Integer workprocedure_no; + + /** + * 工序标识 + */ + private String workprocedure_id; + + /** + * 前道工序标识 + */ + private String preworkprocedure_id; + + /** + * 后道工序标识 + */ + private String nextworkprocedure_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessrouteMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessrouteMapper.java new file mode 100644 index 00000000..bcd5573f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessrouteMapper.java @@ -0,0 +1,21 @@ +package org.nl.wms.product_manage.service.processroute.dao.mapper; + +import org.apache.ibatis.annotations.Param; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 工艺路线主表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface PdmBiProcessrouteMapper extends BaseMapper { + + List getDtl(@Param("processrouteId") String processrouteId); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessroutedtlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessroutedtlMapper.java new file mode 100644 index 00000000..d42a5f84 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/PdmBiProcessroutedtlMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.product_manage.service.processroute.dao.mapper; + +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroutedtl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 工艺路线明细表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface PdmBiProcessroutedtlMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessrouteMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessrouteMapper.xml new file mode 100644 index 00000000..920f9d6a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessrouteMapper.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessroutedtlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessroutedtlMapper.xml new file mode 100644 index 00000000..235614df --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dao/mapper/xml/PdmBiProcessroutedtlMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dto/ProcessrouteQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dto/ProcessrouteQuery.java new file mode 100644 index 00000000..e536745b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/dto/ProcessrouteQuery.java @@ -0,0 +1,30 @@ +package org.nl.wms.product_manage.service.processroute.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.modules.common.base.BaseDTO; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class ProcessrouteQuery extends BaseQuery { + + private String processroute_status; + + private String processroute_code; + + private String is_delete = "0"; + + + @Override + public void paramMapping() { + super.doP.put("processroute_code", QParam.builder().k(new String[]{"processroute_code","processroute_name"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java new file mode 100644 index 00000000..aa86317e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java @@ -0,0 +1,200 @@ +package org.nl.wms.product_manage.service.processroute.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.jetbrains.annotations.NotNull; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.product_manage.service.processroute.IPdmBiProcessroutedtlService; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroutedtl; +import org.nl.wms.product_manage.service.processroute.dao.mapper.PdmBiProcessrouteMapper; +import org.nl.wms.product_manage.service.processroute.IPdmBiProcessrouteService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + *

+ * 工艺路线主表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Service +public class PdmBiProcessrouteServiceImpl extends ServiceImpl implements IPdmBiProcessrouteService { + + @Autowired + private IPdmBiWorkprocedureService workprocedureService; + @Autowired + private IPdmBiProcessroutedtlService pdmBiProcessroutedtlService; + + @Override + @Transactional + public void create(JSONObject json) { + + JSONArray jsonDataArr = json.getJSONArray("tableData"); + // 插入主表 + PdmBiProcessroute processroute = packageMst(json, jsonDataArr); + this.save(processroute); + // 插入明细表 + List list = new ArrayList<>(); + for (int i = 0; i < jsonDataArr.size(); i++) { + JSONObject jsonObject = jsonDataArr.getJSONObject(i); + PdmBiProcessroutedtl processroutedtl = new PdmBiProcessroutedtl(); + processroutedtl.setProcessroutedtl_id(IdUtil.getStringId()); + processroutedtl.setProcessroute_id(processroute.getProcessroute_id()); + processroutedtl.setWorkprocedure_id(jsonObject.getString("workprocedure_id")); + processroutedtl.setWorkprocedure_no(i + 1); + if (i == 0) { + processroutedtl.setPreworkprocedure_id(" "); + processroutedtl.setNextworkprocedure_id(jsonDataArr.getJSONObject(i + 1).getString("workprocedure_id")); + } else if ( i == jsonDataArr.size() - 1) { + processroutedtl.setPreworkprocedure_id(jsonDataArr.getJSONObject(i - 1).getString("workprocedure_id")); + processroutedtl.setNextworkprocedure_id(" "); + } else { + processroutedtl.setPreworkprocedure_id(jsonDataArr.getJSONObject(i - 1).getString("workprocedure_id")); + processroutedtl.setNextworkprocedure_id(jsonDataArr.getJSONObject(i + 1).getString("workprocedure_id")); + } + list.add(processroutedtl); + } + if (!CollectionUtils.isEmpty(list)){ + pdmBiProcessroutedtlService.saveBatch(list); + } + } + + @NotNull + private PdmBiProcessroute packageMst(JSONObject json, JSONArray jsonDataArr) { + PdmBiProcessroute processroute = new PdmBiProcessroute(); + processroute.setProcessroute_id(org.nl.common.utils.IdUtil.getStringId()); + processroute.setProcessroute_code(json.getString("processroute_code")); + processroute.setProcessroute_name(json.getString("processroute_name")); + processroute.setProcessroute_status("10"); + processroute.setDetail_count(new BigDecimal(jsonDataArr.size())); + processroute.setRemark(json.getString("remark")); + processroute.setCreate_id(SecurityUtils.getCurrentUserId()); + processroute.setCreate_name(SecurityUtils.getCurrentNickName()); + processroute.setCreate_name(DateUtil.now()); + return processroute; + } + + @Override + @Transactional + public void update(JSONObject whereJson) { + String processroute_id = MapUtil.getStr(whereJson, "processroute_id"); + + WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 + WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); // 工艺路线明细表 + WQLObject workTab = WQLObject.getWQLObject("pdm_bi_workprocedure"); // 工序表 + + JSONArray dataArr = whereJson.getJSONArray("tableData"); + // 更新主表 + PdmBiProcessroute processroute = this.getOne(new QueryWrapper().eq("processroute_id", processroute_id)); + processroute.setProcessroute_code(whereJson.getString("processroute_code")); + processroute.setProcessroute_name(whereJson.getString("processroute_name")); + processroute.setRemark(whereJson.getString("remark")); + processroute.setDetail_count(new BigDecimal(dataArr.size())); + processroute.setUpdate_optid(SecurityUtils.getCurrentUserId()); + processroute.setUpdate_time(DateUtil.now()); + processroute.setUpdate_optname(SecurityUtils.getCurrentNickName()); + this.updateById(processroute); + // 更新明细表 + List dtlArr = pdmBiProcessroutedtlService.list(new QueryWrapper().eq("processroute_id", processroute_id)); + if (!CollectionUtils.isEmpty(dtlArr)) { + pdmBiProcessroutedtlService.remove(new QueryWrapper().eq("processroute_id", processroute_id)); + List list = new ArrayList<>(); + for (int i = 0; i < dataArr.size(); i++) { + JSONObject jsonObject = dataArr.getJSONObject(i); + PdmBiProcessroutedtl processroutedtl = new PdmBiProcessroutedtl(); + processroutedtl.setProcessroutedtl_id(IdUtil.getStringId()); + processroutedtl.setProcessroute_id(processroute.getProcessroute_id()); + processroutedtl.setWorkprocedure_id(jsonObject.getString("workprocedure_id")); + processroutedtl.setWorkprocedure_no(i + 1); + if (i == 0) { + processroutedtl.setPreworkprocedure_id(" "); + processroutedtl.setNextworkprocedure_id(dataArr.getJSONObject(i + 1).getString("workprocedure_id")); + } else if ( i == dataArr.size() - 1) { + processroutedtl.setPreworkprocedure_id(dataArr.getJSONObject(i - 1).getString("workprocedure_id")); + processroutedtl.setNextworkprocedure_id(" "); + } else { + processroutedtl.setPreworkprocedure_id(dataArr.getJSONObject(i - 1).getString("workprocedure_id")); + processroutedtl.setNextworkprocedure_id(dataArr.getJSONObject(i + 1).getString("workprocedure_id")); + } + list.add(processroutedtl); + } + if (!CollectionUtils.isEmpty(list)){ + pdmBiProcessroutedtlService.saveBatch(list); + } + } + } + + @Override + public void deleteAll(Long[] ids) { + this.update(new UpdateWrapper() + .set("is_delete","1") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .in("processroute_id",ids)); + } + + @Override + public JSONArray getWorkList() { + JSONArray array = new JSONArray(); + List list = workprocedureService.list(new QueryWrapper().eq("is_used",true)); + for (PdmBiWorkprocedure workprocedure : list) { + JSONObject object = new JSONObject(); + object.put("value",workprocedure.getWorkprocedure_id()); + object.put("label",workprocedure.getWorkprocedure_name()); + object.put("code",workprocedure.getWorkprocedure_code()); + array.add(object); + } + return array; + } + + @Override + public void CancelSubmit(JSONObject whereJson) { + this.update(new UpdateWrapper() + .set("processroute_status","10") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .set("audit_id"," ") + .set("audit_name"," ") + .set("audit_time"," ") + .eq("processroute_id",whereJson.getString("processroute_id"))); + } + + @Override + public void submit(JSONObject whereJson) { + this.update(new UpdateWrapper() + .set("processroute_status","20") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .set("audit_id",SecurityUtils.getCurrentUserId()) + .set("audit_name",SecurityUtils.getCurrentNickName()) + .set("audit_time",DateUtil.now()) + .eq("processroute_id",whereJson.getString("processroute_id"))); + } + + @Override + public List getDtl(Map map) { + return this.baseMapper.getDtl(MapUtil.getStr(map, "processroute_id")); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessroutedtlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessroutedtlServiceImpl.java new file mode 100644 index 00000000..eeeec52f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessroutedtlServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.product_manage.service.processroute.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.product_manage.service.processroute.IPdmBiProcessroutedtlService; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroutedtl; +import org.nl.wms.product_manage.service.processroute.dao.mapper.PdmBiProcessroutedtlMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 工艺路线明细表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Service +public class PdmBiProcessroutedtlServiceImpl extends ServiceImpl implements IPdmBiProcessroutedtlService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessrouteService.java new file mode 100644 index 00000000..4d8450a4 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessrouteService.java @@ -0,0 +1,79 @@ +package org.nl.wms.product_manage.service.productProcessRoute; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroute; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 产品工艺路线主表 服务类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface IPdmBiProductprocessrouteService extends IService { + + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + List queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param processroute_id ID + * @return Productprocessroute + */ + Object findById(String processroute_id); + + /** + * 根据编码查询 + * @param code code + * @return Productprocessroute + */ + Object findByCode(String code); + + + /** + * 创建 + * @param whereJson / + */ + void create(Map whereJson); + + /** + * 编辑 + * @param whereJson / + */ + void update(Map whereJson); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); + + List getRoute(Map whereJson); + + List getRouteDtl(Map whereJson); + + List getProductRouteDtl(Map whereJson); + + void submit(JSONObject whereJson); + + void unSubmit(JSONObject whereJson); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessroutedtlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessroutedtlService.java new file mode 100644 index 00000000..3f0fffec --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/IPdmBiProductprocessroutedtlService.java @@ -0,0 +1,16 @@ +package org.nl.wms.product_manage.service.productProcessRoute; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroutedtl; + +/** + *

+ * 产品工艺路线明细表 服务类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface IPdmBiProductprocessroutedtlService extends IService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java new file mode 100644 index 00000000..3a4a165e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java @@ -0,0 +1,120 @@ +package org.nl.wms.product_manage.service.productProcessRoute.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 产品工艺路线主表 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_productprocessroute") +public class PdmBiProductprocessroute implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 产品工艺路线标识 + */ + private String productprocess_id; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 工艺路线标识 + */ + private String processroute_id; + + /** + * 产品工艺路线状态 + */ + private String productprocess_status; + + /** + * 明细数 + */ + private Integer detail_count; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 审核人 + */ + private String audit_optid; + + /** + * 审核人姓名 + */ + private String audit_optname; + + /** + * 审核时间 + */ + private String audit_time; + + /** + * 部门ID + */ + private String sysdeptid; + + /** + * 公司ID + */ + private String syscompanyid; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroutedtl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroutedtl.java new file mode 100644 index 00000000..008a9dc5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroutedtl.java @@ -0,0 +1,55 @@ +package org.nl.wms.product_manage.service.productProcessRoute.dao; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 产品工艺路线明细表 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_productprocessroutedtl") +public class PdmBiProductprocessroutedtl implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 产品工艺路线明细标识 + */ + private String productprocessdtl_id; + + /** + * 产品工艺路线标识 + */ + private String productprocess_id; + + /** + * 工序顺序号 + */ + private BigDecimal workprocedure_no; + + /** + * 工序标识 + */ + private String workprocedure_id; + + /** + * 前道工序标识 + */ + private String preworkprocedure_id; + + /** + * 后道工序标识 + */ + private String nextworkprocedure_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessrouteMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessrouteMapper.java new file mode 100644 index 00000000..24e65c54 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessrouteMapper.java @@ -0,0 +1,25 @@ +package org.nl.wms.product_manage.service.productProcessRoute.dao.mapper; + +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroute; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 产品工艺路线主表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface PdmBiProductprocessrouteMapper extends BaseMapper { + + List queryAll(Map query); + + + List getRoutDtl(String processroute_id); + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessroutedtlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessroutedtlMapper.java new file mode 100644 index 00000000..bfa2178f --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/PdmBiProductprocessroutedtlMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.product_manage.service.productProcessRoute.dao.mapper; + +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroutedtl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 产品工艺路线明细表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-27 + */ +public interface PdmBiProductprocessroutedtlMapper extends BaseMapper { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessrouteMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessrouteMapper.xml new file mode 100644 index 00000000..1a1bbddd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessrouteMapper.xml @@ -0,0 +1,50 @@ + + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessroutedtlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessroutedtlMapper.xml new file mode 100644 index 00000000..509de924 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/mapper/xml/PdmBiProductprocessroutedtlMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java new file mode 100644 index 00000000..12ebee11 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java @@ -0,0 +1,199 @@ +package org.nl.wms.product_manage.service.productProcessRoute.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.product_manage.service.processroute.dao.PdmBiProcessroute; +import org.nl.wms.product_manage.service.productProcessRoute.IPdmBiProductprocessroutedtlService; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroute; +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroutedtl; +import org.nl.wms.product_manage.service.productProcessRoute.dao.mapper.PdmBiProductprocessrouteMapper; +import org.nl.wms.product_manage.service.productProcessRoute.IPdmBiProductprocessrouteService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +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 generator + * @since 2023-06-27 + */ +@Service +public class PdmBiProductprocessrouteServiceImpl extends ServiceImpl implements IPdmBiProductprocessrouteService { + + @Autowired + private PdmBiProductprocessroutedtlServiceImpl productprocessroutedtlService; + + @Override + public List queryAll(Map whereJson, Pageable page) { + return this.baseMapper.queryAll(whereJson); + } + + @Override + public List queryAll(Map whereJson) { + return this.baseMapper.queryAll(whereJson); + } + + @Override + public Object findById(String processroute_id) { + return null; + } + + @Override + public Object findByCode(String code) { + return null; + } + + @Override + @Transactional + public void create(Map whereJson) { + JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); + JSONArray rows = jo.getJSONArray("tableData"); + if (ObjectUtil.isEmpty(rows)) { + throw new BadRequestException("不存在任何明细！"); + } + //创建主表 + PdmBiProductprocessroute one = this.getOne(new QueryWrapper() + .eq("material_id", jo.getString("material_id")) + .eq("is_delete", '0')); + if (one!=null) { + throw new BadRequestException("该产品已经存在工艺路线！"); + } + PdmBiProductprocessroute packageMst = packageMst(jo, rows); + this.save(packageMst); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + row.put("productprocessdtl_id", org.nl.common.utils.IdUtil.getStringId()); + row.put("productprocess_id", packageMst.getProductprocess_id()); + PdmBiProductprocessroutedtl item = row.toJavaObject(PdmBiProductprocessroutedtl.class); + productprocessroutedtlService.save(item); + } + } + + private PdmBiProductprocessroute packageMst(JSONObject jo, JSONArray rows) { + PdmBiProductprocessroute productprocessroute = new PdmBiProductprocessroute(); + productprocessroute.setProductprocess_id(org.nl.common.utils.IdUtil.getStringId()); + productprocessroute.setMaterial_id(jo.getString("material_id")); + productprocessroute.setProcessroute_id(jo.getString("processroute_id")); + productprocessroute.setProductprocess_status("10"); + productprocessroute.setDetail_count(rows.size()); + productprocessroute.setRemark(jo.getString("remark")); + productprocessroute.setCreate_id(SecurityUtils.getCurrentUserId()); + productprocessroute.setCreate_time(DateUtil.now()); + productprocessroute.setCreate_name(SecurityUtils.getCurrentNickName()); + productprocessroute.setIs_delete("0"); + return productprocessroute; + } + + @Override + public void update(Map whereJson) { + + if (ObjectUtil.isEmpty(whereJson)) { + throw new BadRequestException("传入数据不能为空！"); + } + JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); + JSONArray rows = jo.getJSONArray("tableData"); + + if (ObjectUtil.isEmpty(rows)) { + throw new BadRequestException("不存在任何明细！"); + } + String productprocess_id = jo.getString("productprocess_id"); + + PdmBiProductprocessroute one = this.getOne(new QueryWrapper() + .eq("material_id", jo.getString("material_id")) + .eq("is_delete", '0') + .ne("productprocess_id",productprocess_id)); + if (one !=null) { + throw new BadRequestException("该产品已经存在工艺路线！"); + } + + this.update(new UpdateWrapper() + .set("remark",jo.getString("remark")) + .set("material_id",jo.getString("material_id")) + .set("detail_count",rows.size()) + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()).eq("productprocess_id",jo.getString("productprocess_id") )); + productprocessroutedtlService.remove(new QueryWrapper() + .eq("productprocess_id",jo.getString("productprocess_id"))); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + row.put("productprocessdtl_id", IdUtil.getSnowflake(1, 1).nextId()); + row.put("productprocess_id", one.getProductprocess_id()); + PdmBiProductprocessroutedtl item = row.toJavaObject(PdmBiProductprocessroutedtl.class); + productprocessroutedtlService.save(item); + } + } + + @Override + public void deleteAll(Long[] ids) { + this.update(new UpdateWrapper() + .set("is_delete","1") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .in("productprocess_id",ids )); + } + + @Override + public List getRoute(Map whereJson) { + return null; + } + + @Override + public List getRouteDtl(Map whereJson) { + JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); + return this.baseMapper.getRoutDtl(jo.getString("processroute_id")); + } + + @Override + public List getProductRouteDtl(Map whereJson) { + return null; + } + + @Override + public void submit(JSONObject whereJson) { + this.update(new UpdateWrapper() + .set("productprocess_status","20") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .set("audit_optid",SecurityUtils.getCurrentUserId()) + .set("audit_optname",SecurityUtils.getCurrentNickName()) + .set("audit_time",DateUtil.now()) + .eq("processroute_id",whereJson.getString("processroute_id"))); + } + + @Override + public void unSubmit(JSONObject whereJson) { + this.update(new UpdateWrapper() + .set("productprocess_status","10") + .set("update_optid",SecurityUtils.getCurrentUserId()) + .set("update_optname",SecurityUtils.getCurrentNickName()) + .set("update_time",DateUtil.now()) + .set("audit_optid"," ") + .set("audit_optname"," ") + .set("audit_time"," ") + .eq("processroute_id",whereJson.getString("processroute_id"))); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessroutedtlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessroutedtlServiceImpl.java new file mode 100644 index 00000000..a15152dc --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessroutedtlServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.product_manage.service.productProcessRoute.impl; + +import org.nl.wms.product_manage.service.productProcessRoute.dao.PdmBiProductprocessroutedtl; +import org.nl.wms.product_manage.service.productProcessRoute.dao.mapper.PdmBiProductprocessroutedtlMapper; +import org.nl.wms.product_manage.service.productProcessRoute.IPdmBiProductprocessroutedtlService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 产品工艺路线明细表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-27 + */ +@Service +public class PdmBiProductprocessroutedtlServiceImpl extends ServiceImpl implements IPdmBiProductprocessroutedtlService { + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 920c2e42..8b719567 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -229,20 +229,20 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl workorders = this.list(new QueryWrapper().in("workorder_id", ids)); - for (PdmProduceWorkorder one : workorders) { - WorkorderRecord record = WorkorderRecord.builder() - .workorder_id(one.getWorkorder_id()) - .device_code(one.getDevice_code()) - .dq_init_qty(one.getReal_qty()) - .dq_finish_qty(one.getReal_qty()) - .operatetime_start(one.getCreate_time()) - .workprocedure_id(one.getWorkprocedure_id()) - .operatetime_end(DateUtil.now()) - .shift_type_scode(one.getShift_type_scode()) - .product_area(one.getProduct_area()).build(); - OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record); - } +// List workorders = this.list(new QueryWrapper().in("workorder_id", ids)); +// for (PdmProduceWorkorder one : workorders) { +// WorkorderRecord record = WorkorderRecord.builder() +// .workorder_id(one.getWorkorder_id()) +// .device_code(one.getDevice_code()) +// .dq_init_qty(one.getReal_qty()) +// .dq_finish_qty(one.getReal_qty()) +// .operatetime_start(one.getCreate_time()) +// .workprocedure_id(one.getWorkprocedure_id()) +// .operatetime_end(DateUtil.now()) +// .shift_type_scode(one.getShift_type_scode()) +// .product_area(one.getProduct_area()).build(); +// OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record); +// } } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java index ba16872a..a36c17bb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java @@ -1,6 +1,7 @@ package org.nl.wms.product_manage.service.workprocedure; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; @@ -18,4 +19,8 @@ public interface IPdmBiWorkprocedureService extends IService * @return */ JSONArray downSelect(); + + void create(JSONObject form); + + void update(JSONObject form); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/dto/WorkprocedureQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/dto/WorkprocedureQuery.java new file mode 100644 index 00000000..7ad306fd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/dto/WorkprocedureQuery.java @@ -0,0 +1,25 @@ +package org.nl.wms.product_manage.service.workprocedure.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; + +import java.util.Map; + +/* + * @author ZZQ + * @Date 2023/4/26 11:05 + */ +@Data +public class WorkprocedureQuery extends BaseQuery { + + private String search; + private String product_area; + + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"workprocedure_code","workprocedure_name"}).type(QueryTEnum.LT).build()); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java index 15d564b4..5421354a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java @@ -1,13 +1,22 @@ package org.nl.wms.product_manage.service.workprocedure.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto; import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure; import org.nl.wms.product_manage.service.workprocedure.dao.mapper.PdmBiWorkprocedureMapper; +import org.nl.wms.system_manage.service.user.dto.CurrentUser; import org.springframework.stereotype.Service; import java.util.List; @@ -29,4 +38,34 @@ public class PdmBiWorkprocedureServiceImpl extends ServiceImpl() + .eq("workprocedure_code", form.getString("workprocedure_code"))); + if (ObjectUtil.isNotEmpty(byCode)) { + throw new BadRequestException("编码已存在!"); + } + PdmBiWorkprocedure entity = form.toJavaObject(PdmBiWorkprocedure.class); + entity.setWorkprocedure_id(org.nl.common.utils.IdUtil.getStringId()); + entity.setCreate_id(SecurityUtils.getCurrentUserId()); + entity.setCreate_time(DateUtil.now()); + entity.setCreate_name(SecurityUtils.getCurrentNickName()); + this.save(entity); + } + + @Override + public void update(JSONObject form) { + PdmBiWorkprocedure one = this.getOne(new QueryWrapper() + .eq("workprocedure_code", form.getString("workprocedure_code")) + .ne("workprocedure_id", form.getString("workprocedure_id"))); + if (ObjectUtil.isNotEmpty(one)){ + throw new BadRequestException("存在相同的编码!"); + } + PdmBiWorkprocedure entity = form.toJavaObject(PdmBiWorkprocedure.class); + entity.setUpdate_time(DateUtil.now()); + entity.setUpdate_id(SecurityUtils.getCurrentUserId()); + entity.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(entity); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java deleted file mode 100644 index 3b26737a..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java +++ /dev/null @@ -1,100 +0,0 @@ - -package org.nl.wms.product_manage.备份pdm.service; - - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Lxy - * @description 服务接口 - * @date 2022-03-21 - **/ -public interface ProcessrouteService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param processroute_id ID - * @return Processroute - */ - ProcessrouteDto findById(String processroute_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Processroute - */ - ProcessrouteDto findByCode(String code); - - - /** - * 创建 - * - * @param json / - */ - void create(JSONObject json); - - /** - * 编辑 - * - * @param whereJson / - */ - void update(JSONObject whereJson); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 获取工序 - */ - JSONArray getWorkList(); - - /** - * 获取明细 - * - * @param map / - */ - JSONArray getDtl(Map map); - - /** - * 提交 - * - * @param whereJson / - */ - void submit(JSONObject whereJson); - - /** - * 取消提交 - * - * @param whereJson / - */ - void CancelSubmit(JSONObject whereJson); -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java deleted file mode 100644 index e63b1ba6..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.nl.wms.product_manage.备份pdm.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author zhouz -* @date 2022-03-22 -**/ -public interface ProductprocessrouteService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param processroute_id ID - * @return Productprocessroute - */ - ProductprocessrouteDto findById(String processroute_id); - - /** - * 根据编码查询 - * @param code code - * @return Productprocessroute - */ - ProductprocessrouteDto findByCode(String code); - - - /** - * 创建 - * @param whereJson / - */ - void create(Map whereJson); - - /** - * 编辑 - * @param whereJson / - */ - void update(Map whereJson); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - JSONArray getRoute(Map whereJson); - - JSONArray getRouteDtl(Map whereJson); - - JSONArray getProductRouteDtl(Map whereJson); - - void submit(JSONObject whereJson); - - void unSubmit(JSONObject whereJson); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java deleted file mode 100644 index ff0ab0a9..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java +++ /dev/null @@ -1,246 +0,0 @@ - -package org.nl.wms.product_manage.备份pdm.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.JSONArray; -import com.alibaba.fastjson.JSONObject; - import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; - - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService; -import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto; - -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 Lxy - * @description 服务实现 - * @date 2022-03-21 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class ProcessrouteServiceImpl implements ProcessrouteService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String processroute_code = MapUtil.getStr(whereJson, "processroute_code"); - HashMap map = new HashMap<>(); - - map.put("flag", "1"); - map.put("processroute_status", MapUtil.getStr(whereJson, "processroute_status")); - if (StrUtil.isNotEmpty(processroute_code)) map.put("processroute_code", "%" + processroute_code + "%"); - - JSONObject json = WQL.getWO("QP_BI_PROCESSROUTE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(ProcessrouteDto.class); - return list; - } - - @Override - public ProcessrouteDto findById(String processroute_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONObject json = wo.query("processroute_id = '" + processroute_id + "'").uniqueResult(0); - final ProcessrouteDto obj = json.toJavaObject(ProcessrouteDto.class); - return obj; - } - - @Override - public ProcessrouteDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - final ProcessrouteDto obj = json.toJavaObject(ProcessrouteDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(JSONObject json) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); // 工艺路线明细表 - WQLObject workTab = WQLObject.getWQLObject("pdm_bi_workprocedure"); // 工序表 - JSONArray jsonDataArr = json.getJSONArray("tableData"); - - // 插入主表 - JSONObject jsonMst = new JSONObject(); - jsonMst.put("processroute_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonMst.put("processroute_code", json.getString("processroute_code")); - jsonMst.put("processroute_name", json.getString("processroute_name")); - jsonMst.put("processroute_status", "10"); - jsonMst.put("detail_count", jsonDataArr.size()); - jsonMst.put("remark", json.getString("remark")); - jsonMst.put("create_id", currentUserId); - jsonMst.put("create_name", nickName); - jsonMst.put("create_time", DateUtil.now()); - mstTab.insert(jsonMst); - // 插入明细表 - for (int i = 0; i < jsonDataArr.size(); i++) { - JSONObject jsonObject = jsonDataArr.getJSONObject(i); - JSONObject jsonWork = workTab.query("workprocedure_id = '" + jsonObject.getString("workprocedure_id") + "'").uniqueResult(0); - - JSONObject jsonDtl = new JSONObject(); - jsonDtl.put("processroutedtl_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonDtl.put("processroute_id", jsonMst.get("processroute_id")); - jsonDtl.put("workprocedure_no", i + 1); - jsonDtl.put("workprocedure_id", jsonWork.get("workprocedure_id")); - if (i == 0) { - jsonDtl.put("preworkprocedure_id", ""); - jsonDtl.put("nextworkprocedure_id", jsonDataArr.getJSONObject(i + 1).getString("workprocedure_id")); - } else if ( i == jsonDataArr.size() - 1) { - jsonDtl.put("preworkprocedure_id", jsonDataArr.getJSONObject(i - 1).getString("workprocedure_id")); - jsonDtl.put("nextworkprocedure_id", ""); - } else { - jsonDtl.put("preworkprocedure_id", jsonDataArr.getJSONObject(i - 1).getString("workprocedure_id")); - jsonDtl.put("nextworkprocedure_id", jsonDataArr.getJSONObject(i + 1).getString("workprocedure_id")); - } - dtlTab.insert(jsonDtl); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(JSONObject whereJson) { - String processroute_id = MapUtil.getStr(whereJson, "processroute_id"); - ProcessrouteDto entity = this.findById(processroute_id); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); // 工艺路线明细表 - WQLObject workTab = WQLObject.getWQLObject("pdm_bi_workprocedure"); // 工序表 - - JSONArray dataArr = whereJson.getJSONArray("tableData"); - // 更新主表 - JSONObject jsonMst = mstTab.query("processroute_id= '" + processroute_id + "'").uniqueResult(0); - jsonMst.put("processroute_code", whereJson.getString("processroute_code")); - jsonMst.put("processroute_name", whereJson.getString("processroute_name")); - jsonMst.put("remark", whereJson.getString("remark")); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("detail_count", dataArr.size()); - mstTab.update(jsonMst); - // 更新明细表 - JSONArray dtlArr = dtlTab.query("processroute_id = '" + processroute_id + "'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(dtlArr)) dtlTab.delete("processroute_id = '" + processroute_id + "'"); - for (int i = 0; i < dataArr.size(); i++) { - JSONObject jsonObject = dataArr.getJSONObject(i); - JSONObject jsonWork = workTab.query("workprocedure_id = '" + jsonObject.getString("workprocedure_id") + "'").uniqueResult(0); - - JSONObject jsonDtl = new JSONObject(); - jsonDtl.put("processroutedtl_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonDtl.put("processroute_id", jsonMst.get("processroute_id")); - jsonDtl.put("workprocedure_no", i + 1); - jsonDtl.put("workprocedure_id", jsonObject.get("workprocedure_id")); - if (i == 0) { - jsonDtl.put("preworkprocedure_id", ""); - jsonDtl.put("nextworkprocedure_id", dataArr.getJSONObject(i + 1).getString("workprocedure_id")); - } else if ( i == dataArr.size() - 1) { - jsonDtl.put("preworkprocedure_id", dataArr.getJSONObject(i - 1).getString("workprocedure_id")); - jsonDtl.put("nextworkprocedure_id", ""); - } else { - jsonDtl.put("preworkprocedure_id", dataArr.getJSONObject(i - 1).getString("workprocedure_id")); - jsonDtl.put("nextworkprocedure_id", dataArr.getJSONObject(i + 1).getString("workprocedure_id")); - } - dtlTab.insert(jsonDtl); - } - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - for (Long processroute_id : ids) { - JSONObject param = new JSONObject(); - param.put("processroute_id", String.valueOf(processroute_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONArray getWorkList() { - JSONArray resultJSONArray = WQL.getWO("QP_BI_PROCESSROUTE01").addParam("flag", "2").process().getResultJSONArray(0); - return resultJSONArray; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONArray getDtl(Map map) { - String processroute_id = MapUtil.getStr(map, "processroute_id"); - // WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); - - //JSONArray dtlArr = dtlTab.query("processroute_id ='" + processroute_id + "' order by workprocedure_no ASC").getResultJSONArray(0); - JSONArray resultJSONArray = WQL.getWO("QP_BI_PROCESSROUTE01").addParam("flag", "3").addParam("processroute_id",processroute_id).process().getResultJSONArray(0); - return resultJSONArray; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void submit(JSONObject whereJson) { - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - -/* JSONObject jsonMst = mstTab.query("processroute_id ='" + whereJson.getString("processroute_id") + "' and is_delete = '0'").uniqueResult(0);*/ - JSONObject jsonMst = new JSONObject(); - jsonMst.put("processroute_id", whereJson.getString("processroute_id")); - jsonMst.put("processroute_status", "20"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("audit_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("audit_time", DateUtil.now()); - mstTab.update(jsonMst); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void CancelSubmit(JSONObject whereJson) { - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - JSONObject jsonMst = new JSONObject(); - jsonMst.put("processroute_id", whereJson.getString("processroute_id")); - jsonMst.put("processroute_status", "10"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", ""); - jsonMst.put("audit_optname", ""); - jsonMst.put("audit_time", ""); - mstTab.update(jsonMst); - } -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java deleted file mode 100644 index 6199d79e..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java +++ /dev/null @@ -1,253 +0,0 @@ - -package org.nl.wms.product_manage.备份pdm.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.modules.common.exception.BadRequestException; - - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService; -import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto; - -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 zhouz - * @description 服务实现 - * @date 2022-03-22 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class ProductprocessrouteServiceImpl implements ProductprocessrouteService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - HashMap map = new HashMap<>(); - map.put("flag", "4"); - if (StrUtil.isNotEmpty(MapUtil.getStr(whereJson, "processroute_code"))) { - map.put("processroute_code", "%" + MapUtil.getStr(whereJson, "processroute_code")+"%"); - } - map.put("productprocess_status", MapUtil.getStr(whereJson, "productprocess_status")); - String material_code = MapUtil.getStr(whereJson, "material_code"); - if (StrUtil.isNotEmpty(material_code)) { - map.put("material_code", "%" + material_code + "%"); - } - - JSONObject jo = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time desc"); - return jo; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_productprocessroute"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(ProductprocessrouteDto.class); - return list; - } - - @Override - public ProductprocessrouteDto findById(String processroute_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_productprocessroute"); - JSONObject json = wo.query("processroute_id = '" + processroute_id + "'").uniqueResult(0); - final ProductprocessrouteDto obj = json.toJavaObject(ProductprocessrouteDto.class); - return obj; - } - - @Override - public ProductprocessrouteDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_productprocessroute"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - final ProductprocessrouteDto obj = json.toJavaObject(ProductprocessrouteDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(Map whereJson) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - if (ObjectUtil.isEmpty(whereJson)) { - throw new BadRequestException("传入数据不能为空！"); - } - JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); - JSONArray rows = jo.getJSONArray("tableData"); - - if (ObjectUtil.isEmpty(rows)) { - throw new BadRequestException("不存在任何明细！"); - } - //创建主表 - JSONObject mst_jo = new JSONObject(); - String productprocess_id = IdUtil.getSnowflake(1, 1).nextId() + ""; - mst_jo.put("productprocess_id", productprocess_id); - JSONObject mater_jo = WQLObject.getWQLObject("PDM_BI_ProductProcessRoute").query("material_id = '" + jo.getString("material_id") + "' AND is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(mater_jo)) { - throw new BadRequestException("该产品已经存在工艺路线！"); - } - mst_jo.put("material_id", jo.getString("material_id")); - mst_jo.put("processroute_id", jo.getString("processroute_id")); - mst_jo.put("productprocess_status", "10"); - mst_jo.put("detail_count", rows.size()); - mst_jo.put("remark", jo.getString("remark")); - mst_jo.put("create_id", currentUserId); - mst_jo.put("create_name", nickName); - mst_jo.put("create_time", DateUtil.now()); - mst_jo.put("update_optid", currentUserId); - mst_jo.put("update_optname", nickName); - mst_jo.put("update_time", DateUtil.now()); - mst_jo.put("is_delete", "0"); - - WQLObject.getWQLObject("PDM_BI_ProductProcessRoute").insert(mst_jo); - - for (int i = 0; i < rows.size(); i++) { - JSONObject row = rows.getJSONObject(i); - row.put("productprocessdtl_id", IdUtil.getSnowflake(1, 1).nextId()); - row.put("productprocess_id", productprocess_id); - WQLObject.getWQLObject("PDM_BI_ProductProcessRouteDtl").insert(row); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(Map whereJson) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - if (ObjectUtil.isEmpty(whereJson)) { - throw new BadRequestException("传入数据不能为空！"); - } - JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); - JSONArray rows = jo.getJSONArray("tableData"); - - if (ObjectUtil.isEmpty(rows)) { - throw new BadRequestException("不存在任何明细！"); - } - String productprocess_id = jo.getString("productprocess_id"); - HashMap mst_map = new HashMap(); - mst_map.put("update_optid", currentUserId); - mst_map.put("update_optname", nickName); - mst_map.put("update_time", DateUtil.now()); - mst_map.put("processroute_id", jo.getString("processroute_id")); - mst_map.put("detail_count", rows.size()); - mst_map.put("remark", jo.getString("remark")); - mst_map.put("material_id", jo.getString("material_id")); - JSONObject mater_jo = WQLObject.getWQLObject("PDM_BI_ProductProcessRoute").query("material_id = '" + jo.getString("material_id") + "' AND is_delete = '0' AND productprocess_id <> '" + productprocess_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(mater_jo)) { - throw new BadRequestException("该产品已经存在工艺路线！"); - } - WQLObject.getWQLObject("PDM_BI_ProductProcessRoute").update(mst_map, "productprocess_id = '" + jo.getString("productprocess_id") + "'"); - - WQLObject.getWQLObject("PDM_BI_ProductProcessRouteDtl").delete("productprocess_id = '" + jo.getString("productprocess_id") + "'"); - - for (int i = 0; i < rows.size(); i++) { - JSONObject row = rows.getJSONObject(i); - row.put("productprocessdtl_id", IdUtil.getSnowflake(1, 1).nextId()); - row.put("productprocess_id", productprocess_id); - WQLObject.getWQLObject("PDM_BI_ProductProcessRouteDtl").insert(row); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_productprocessroute"); - for (Long productprocess_id : ids) { - JSONObject param = new JSONObject(); - param.put("productprocess_id", String.valueOf(productprocess_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } - - @Override - public JSONArray getRoute(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONArray array = wo.query("is_delete = '0' and processroute_status ='20'").getResultJSONArray(0); -/* - JSONArray rows = new JSONArray(); - if (ObjectUtil.isEmpty(jsonSeries)) { - return rows; - } else { - rows = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParam("flag", "5").addParam("processroute_id", jsonSeries.getString("processroute_id")).process().getResultJSONArray(0); - }*/ - return array; - } - - @Override - public JSONArray getRouteDtl(Map whereJson) { - JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); - JSONArray rows = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParam("flag", "2").addParam("processroute_id", jo.getString("processroute_id")).process().getResultJSONArray(0); - return rows; - } - - @Override - public JSONArray getProductRouteDtl(Map whereJson) { - JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); - JSONArray rows = WQL.getWO("QPDM_BI_PRODUCTROUTE01").addParam("flag", "3").addParam("productprocess_id", jo.getString("productprocess_id")).process().getResultJSONArray(0); - return rows; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void submit(JSONObject whereJson) { - WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_ProductProcessRoute"); // 产品工艺路线主表 - - JSONObject jsonMst = mstTab.query("productprocess_id ='" + whereJson.getString("productprocess_id") + "' and is_delete = '0'").uniqueResult(0); - jsonMst.put("productprocess_status", "20"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("audit_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("audit_time", DateUtil.now()); - mstTab.update(jsonMst); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void unSubmit(JSONObject whereJson) { - WQLObject mstTab = WQLObject.getWQLObject("PDM_BI_ProductProcessRoute"); // 产品工艺路线主表 - - JSONObject jsonMst = mstTab.query("productprocess_id ='" + whereJson.getString("productprocess_id") + "' and is_delete = '0'").uniqueResult(0); - if (!jsonMst.getString("productprocess_status").equals("20")) { - throw new BadRequestException("请选择提交状态的进行取消！"); - } - jsonMst.put("productprocess_status", "10"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", ""); - jsonMst.put("audit_optname", ""); - jsonMst.put("audit_time", ""); - mstTab.update(jsonMst); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql deleted file mode 100644 index 8a9e7e1c..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql +++ /dev/null @@ -1,145 +0,0 @@ -[交易说明] - 交易名： 工艺路线分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.processroute_id TYPEAS s_string - 输入.productprocess_id TYPEAS s_string - 输入.processroute_code TYPEAS s_string - 输入.productprocess_status TYPEAS s_string - 输入.material_code TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - * - FROM - pdm_bi_processroute route - WHERE - route.processroute_status = '20' - AND - route.is_delete = '0' - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - dtl.*, - route.processroute_name, - workProcedure.workprocedure_name, - pre.workprocedure_name as pre_workprocedure_name, - next.workprocedure_name as next_workprocedure_name - FROM - pdm_bi_processroutedtl dtl - left join PDM_BI_ProcessRoute route on dtl.processroute_id = route.processroute_id - left join PDM_BI_WorkProcedure workProcedure on dtl.workprocedure_id = workProcedure.workprocedure_id - left join PDM_BI_WorkProcedure pre on dtl.preworkprocedure_id = pre.workprocedure_id - left join PDM_BI_WorkProcedure next on dtl.nextworkprocedure_id = next.workprocedure_id - WHERE - dtl.processroute_id = 输入.processroute_id - order by - dtl.workprocedure_no - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - * - FROM - pdm_bi_productprocessroutedtl - WHERE - productprocess_id = 输入.productprocess_id - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "4" - PAGEQUERY - SELECT - pp.*, - mb.material_code, - (case when pp.productprocess_status = '10' then '生成' when pp.productprocess_status = '20' then '提交' end) AS status_name, - mb.material_name, - route.processroute_name, - route.processroute_code - FROM - pdm_bi_productprocessroute pp - LEFT JOIN md_me_materialbase mb ON mb.material_id = pp.material_id - LEFT JOIN PDM_BI_ProcessRoute route ON route.processroute_id = pp.processroute_id - WHERE - pp.is_delete = '0' - OPTION 输入.processroute_code <> "" - (route.processroute_code like 输入.processroute_code - OR - route.processroute_name like 输入.processroute_code - ) - ENDOPTION - OPTION 输入.productprocess_status <> "" - pp.productprocess_status = 输入.productprocess_status - ENDOPTION - OPTION 输入.material_code <> "" - mb.material_code like 输入.material_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - * - FROM - pdm_bi_processroute route - WHERE - route.processroute_status = '20' - AND - route.is_delete = '0' - - OPTION 输入.processroute_id <> "" - processroute_id = 输入.processroute_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql deleted file mode 100644 index f7f009a3..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql +++ /dev/null @@ -1,93 +0,0 @@ -[交易说明] - 交易名： 工艺路线分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.processroute_status TYPEAS s_string - 输入.processroute_code TYPEAS s_string - 输入.processroute_id TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - * - FROM - PDM_BI_ProcessRoute - WHERE - is_delete = '0' - OPTION 输入.processroute_code <> "" - (processroute_code like 输入.processroute_code or - processroute_name like 输入.processroute_code) - ENDOPTION - OPTION 输入.processroute_status <> "" - processroute_status = 输入.processroute_status - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - workprocedure_id AS value, - workprocedure_name AS label, - workprocedure_code AS code - FROM - PDM_BI_WorkProcedure - WHERE - is_delete = '0' - AND is_used = '1' - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - dtl.*, - work.workprocedure_code - FROM - PDM_BI_ProcessRouteDtl dtl - left join PDM_BI_WorkProcedure work on work.workprocedure_id = dtl.workprocedure_id - WHERE - is_delete = '0' and dtl.processroute_id = 输入.processroute_id - ENDSELECT - ENDQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehilematerialMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehilematerialMapper.xml index f1841706..20cb0e9a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehilematerialMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/cacheline/dao/mapper/xml/SchCachelineVehilematerialMapper.xml @@ -37,8 +37,8 @@ and v.material_id = #{material_id} - - and v.workprocedure_id = #{workprocedure_id} + + and v.workprocedure_code = #{workprocedure_code} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java index 5d030f3d..77d3efe6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java @@ -15,9 +15,12 @@ import org.nl.wms.system_manage.service.quartz.impl.SysQuartzJobServiceImpl; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.quartz.QuartzJobBean; +import javax.annotation.Resource; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; @@ -35,7 +38,10 @@ public class ExecutionJob extends QuartzJobBean { /** * 该处仅供参考 */ - private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); + @Resource + @Qualifier("meshandlerPool") + private ThreadPoolExecutor EXECUTOR; + @Override protected void executeInternal(JobExecutionContext context) throws JobExecutionException { SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY); diff --git a/mes/qd/src/layout/components/Sidebar/Logo.vue b/mes/qd/src/layout/components/Sidebar/Logo.vue index 2de73892..7d1a6e5d 100644 --- a/mes/qd/src/layout/components/Sidebar/Logo.vue +++ b/mes/qd/src/layout/components/Sidebar/Logo.vue @@ -34,7 +34,7 @@ export default { }, data() { return { - title: '诺力mes平台', + title: '海量mes系统', logo: Logo, title_param: 'platform' } diff --git a/mes/qd/src/views/login.vue b/mes/qd/src/views/login.vue index df159fe0..2e190518 100644 --- a/mes/qd/src/views/login.vue +++ b/mes/qd/src/views/login.vue @@ -2,7 +2,7 @@