From 8a0a9b7634539a7dc7716fe3beb55897cb1a4b7f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 21 Mar 2024 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5+=E6=8A=A5=E5=B7=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/domain/quality/HRInfo.java | 92 +++++++++++++++++++ .../op/mes/domain/MesReportWorkConsume.java | 9 ++ .../service/impl/IWCInterfaceServiceImpl.java | 2 +- .../mapper/mes/MesReportWorkConsumeMapper.xml | 7 +- .../op/open/service/impl/OpenServiceImpl.java | 5 +- .../plan/controller/ProOrderController.java | 7 ++ .../plan/mapper/ProOrderWorkorderMapper.java | 3 + .../com/op/plan/service/IProOrderService.java | 2 + .../service/impl/ProOrderServiceImpl.java | 9 ++ .../mapper/plan/ProOrderWorkorderMapper.xml | 8 ++ .../service/impl/SysUserServiceImpl.java | 36 +++++--- .../resources/mapper/system/SysUserMapper.xml | 7 +- 12 files changed, 167 insertions(+), 20 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java index e04cb185..7e8f4eef 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java @@ -60,6 +60,98 @@ public class HRInfo extends BaseEntity { /** 角色ID */ private Long roleId; private String datasourceId; + private String post; + /**hr接口**/ + private String peWorkID;//工号 + private String peName;//员工姓名 + private String peSex;//性别 F女生 M男 + private String peMobilePhone;//手机号 + //派驻1 人才库-1 试用10 实习11 见习期19 正式工20 离职30 自离31 辞退32 开除33 删除99 + private String peDocStatus; + private String posnm;//岗位名称 + private String poscd;//岗位编码 + private String ounam;//部门名称 + private String oucod;//部门编码 + + public String getPeWorkID() { + return peWorkID; + } + + public void setPeWorkID(String peWorkID) { + this.peWorkID = peWorkID; + } + + public String getPeName() { + return peName; + } + + public void setPeName(String peName) { + this.peName = peName; + } + + public String getPeSex() { + return peSex; + } + + public void setPeSex(String peSex) { + this.peSex = peSex; + } + + public String getPeMobilePhone() { + return peMobilePhone; + } + + public void setPeMobilePhone(String peMobilePhone) { + this.peMobilePhone = peMobilePhone; + } + + public String getPeDocStatus() { + return peDocStatus; + } + + public void setPeDocStatus(String peDocStatus) { + this.peDocStatus = peDocStatus; + } + + public String getPosnm() { + return posnm; + } + + public void setPosnm(String posnm) { + this.posnm = posnm; + } + + public String getPoscd() { + return poscd; + } + + public void setPoscd(String poscd) { + this.poscd = poscd; + } + + public String getOunam() { + return ounam; + } + + public void setOunam(String ounam) { + this.ounam = ounam; + } + + public String getOucod() { + return oucod; + } + + public void setOucod(String oucod) { + this.oucod = oucod; + } + + public String getPost() { + return post; + } + + public void setPost(String post) { + this.post = post; + } public String getDatasourceId() { return datasourceId; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index beaa3cfa..10aa4395 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -111,6 +111,15 @@ public class MesReportWorkConsume extends BaseEntity { private String warehouseCode; private String warehouseName; + private String planQuantity; + + public String getPlanQuantity() { + return planQuantity; + } + + public void setPlanQuantity(String planQuantity) { + this.planQuantity = planQuantity; + } public String getWarehouseCode() { return warehouseCode; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index b8c3ca60..2edfbc70 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -451,7 +451,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { mapBom = new HashMap(); mapBom.put("P_AUFNR",updateBom.getWorkorderCodeSap());// 订单号 例如：000100308287 mapBom.put("P_MATNR",updateBom.getMaterialCode());// 物料号 例如：000000040000015089 - mapBom.put("P_GMEIN",updateBom.getUnit());// 基本计量单位 例如：m + //mapBom.put("P_GMEIN",updateBom.getUnit());// 基本计量单位 例如：m mapBom.put("P_WERKS",workOrderCodes.get(0).getFactoryCode());//物料工厂 例如：1000 mapBom.put("P_LGORT",updateBom.getWarehouseCode());//仓库编号 例如：0013 mapList.add(mapBom); diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 559692d2..db3b3a7a 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -104,10 +104,13 @@ mrwc.recoil, pow.workorder_code_sap workorderCodeSap, mrwc.attr1, - mrwc.warehouse_code warehouseCode + mrwc.warehouse_code warehouseCode, + mpd.quantity planQuantity from mes_report_work_consume mrwc left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code - where mrwc.del_flag = '0' and pow.del_flag = '0' + left join mes_prepare_detail mpd on mpd.parent_work_order = pow.belong_work_order + and mpd.material_code = mrwc.material_code + where mrwc.del_flag = '0' and pow.del_flag = '0' and mpd.del_flag = '0' and mrwc.workorder_code = #{workorderCode} order by mrwc.recoil,mrwc.attr1 diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index b40e18a6..f448a89d 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -474,9 +474,10 @@ public class OpenServiceImpl implements OpenService { public AjaxResult GetHrUserInfo(String dateTime) { try { StringBuilder postDataBuilder = new StringBuilder(); - postDataBuilder.append("createTime=").append("dateTime"); + postDataBuilder.append("createTime=").append(dateTime); String result = HttpUtils.sendPost(url_user,postDataBuilder.toString()); - return success(result); + JSONArray jsonArray=JSONArray.parseArray(result); + return success("获取成功",jsonArray); } catch (Exception e) { e.printStackTrace(); return error(e.getMessage()); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java index 9378f944..f3915d6f 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java @@ -153,6 +153,13 @@ public class ProOrderController extends BaseController { return proOrderService.subSplitOrder(splitOrderDTO); } + + @PostMapping("/checkRepeatBatchCodes") + //@RequiresPermissions("mes:pro:order:add") + @Log(title = "提交拆分订单-批次重复确认", businessType = BusinessType.INSERT) + public String checkRepeatBatchCodes(@RequestBody SplitOrderDTO splitOrderDTO) { + return proOrderService.checkRepeatBatchCodes(splitOrderDTO); + } /** * 获取换算值 * diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 19098c91..b9e518f0 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -1,5 +1,6 @@ package com.op.plan.mapper; +import com.op.plan.domain.Batch; import com.op.plan.domain.ProOrder; import com.op.plan.domain.ProOrderWorkorder; import com.op.plan.domain.ProWetMaterialPlanDetail; @@ -194,5 +195,7 @@ public interface ProOrderWorkorderMapper { List getOrderNotW0(@Param("workorderCodes") String[] workorderCodes); List getOrderByOrders(@Param("orderIds") String[] orderIds); + + List checkBatchCodes(@Param("batchs") List formFields); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java index 2b098a57..2edcec22 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java @@ -143,4 +143,6 @@ public interface IProOrderService { int getProSortNo(ProOrder proOrder); int deleteOrder(String[] orderCodes); + + String checkRepeatBatchCodes(SplitOrderDTO splitOrderDTO); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 52ad1800..5ae7f845 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -1171,6 +1171,15 @@ public class ProOrderServiceImpl implements IProOrderService { } return 1; } + @Override + @DS("#header.poolName") + public String checkRepeatBatchCodes(SplitOrderDTO splitOrderDTO) { + List repeatBatchCodes = proOrderWorkorderMapper.checkBatchCodes(splitOrderDTO.getFormFields()); + if(!CollectionUtils.isEmpty(repeatBatchCodes)){ + return StringUtils.join(repeatBatchCodes, ","); + } + return ""; + } public static void main(String args[]){ String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]"; diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index abf3252d..583eb34c 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -543,6 +543,14 @@ and status in ('o1','o0') and del_flag = '0' + insert into mes_prepare_detail diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java index ecbf0a04..39a22380 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java @@ -551,8 +551,8 @@ public class SysUserServiceImpl implements ISysUserService { AjaxResult hrR = remoteOpenService.GetHrUserInfo(ymd); log.info("更新人力-结果:"+ JSONObject.toJSONString(hrR)); List infoList = new ArrayList<>(); - if((int)hrR.get("code")==200){ - infoList=JSONArray.parseArray(hrR.get("msg").toString(),HRInfo.class); + if((int)hrR.get("code")==200 && hrR.get("data")!=null){ + infoList=JSONArray.parseArray(JSONObject.toJSONString(hrR.get("data")),HRInfo.class); if(!CollectionUtils.isEmpty(infoList)){ this.syncUserInfoFunc(infoList); } @@ -574,6 +574,20 @@ public class SysUserServiceImpl implements ISysUserService { dto.setCreateBy(createBy); dto.setUpdateBy(createBy); dto.setUpdateTime(nowDate); + + dto.setUserName(dto.getPeWorkID()); + dto.setNickName(dto.getPeName()); + dto.setSex(dto.getPeSex().equals("F")?"1":"0");//1女 + dto.setStatus("0"); + String[] delArrays = {"30","31","32","33","99"}; + if(Arrays.asList(delArrays).contains(dto.getPeDocStatus())){ + dto.setDelFlag("1"); + }else{ + dto.setDelFlag("0"); + } + dto.setPhonenumber(dto.getPeMobilePhone()); + dto.setPost(dto.getPoscd()); + dto.setDeptId(Long.parseLong(dto.getOucod())); } int n = 0; @@ -584,20 +598,18 @@ public class SysUserServiceImpl implements ISysUserService { //sap返回的工作中心编码-本地不存在// 差集 (list2 - list1) List noExsitCodes = codes.stream().filter(item -> !exsitCodes.contains(item)).collect(Collectors.toList()); - List updates = new ArrayList<>(); - for(String exsitCode:exsitCodes){ - List updates0 = dtos.stream().filter(dto -> dto.getUserCode().equals(exsitCode)).collect(Collectors.toList()); - updates.addAll(updates0); - } + List updates = dtos.stream() + .filter(item -> exsitCodes.contains(item.getUserCode())) + .collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(updates)){ int m = userMapper.updateUserBatchs(updates); System.out.println("人员更新成功条数："+m); } - List adds = new ArrayList<>(); - for(String noExsitCode:noExsitCodes){ - List adds0 = dtos.stream().filter(dto -> dto.getUserCode().equals(noExsitCode)).collect(Collectors.toList()); - adds.addAll(adds0); - } + List adds = dtos.stream() + .filter(item -> noExsitCodes.contains(item.getUserCode())) + .collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(adds)){ n = userMapper.addUserBatchs(adds); System.out.println("人员新增成功条数："+ n); diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml index b3355c5d..8bdce94c 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -188,11 +188,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_user (user_name,nick_name, - post,section, + post,section,dept_id, create_by,create_time,del_flag) VALUES - (#{item.userCode},#{item.userName},#{item.post},#{item.section}, + (#{item.userCode},#{item.userName},#{item.post}, + #{item.section},#{item.deptId}, #{item.createBy},#{item.createTime},'0') @@ -274,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"