人员信息同步+报工修改

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;

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;

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<String, Object>();
                 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);

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
 	</select>

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());

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);
+    }
     /**
      * 获取换算值
      *

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<String> getOrderNotW0(@Param("workorderCodes") String[] workorderCodes);
 
     List<ProOrderWorkorder> getOrderByOrders(@Param("orderIds") String[] orderIds);
+
+    List<String> checkBatchCodes(@Param("batchs") List<Batch> formFields);
 }
 

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);
 }

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<String> 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\"]]";

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -543,6 +543,14 @@
         </foreach>
          and status in ('o1','o0') and del_flag = '0'
     </select>
+    <select id="checkBatchCodes" resultType="java.lang.String">
+        select distinct batch_code
+        from pro_order_workorder_batch
+        where del_flag='1' and batch_code in
+        <foreach item="batch" collection="batchs" open="(" separator="," close=")">
+            #{batch.batchCode}
+        </foreach>
+    </select>
 
     <insert id="createPrepareDetails">
         insert into mes_prepare_detail

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<HRInfo> 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<String> noExsitCodes = codes.stream().filter(item -> !exsitCodes.contains(item)).collect(Collectors.toList());
 
-		List<HRInfo> updates = new ArrayList<>();
-		for(String exsitCode:exsitCodes){
-			List<HRInfo> updates0 = dtos.stream().filter(dto -> dto.getUserCode().equals(exsitCode)).collect(Collectors.toList());
-			updates.addAll(updates0);
-		}
+		List<HRInfo> 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<HRInfo> adds = new ArrayList<>();
-		for(String noExsitCode:noExsitCodes){
-			List<HRInfo> adds0 = dtos.stream().filter(dto -> dto.getUserCode().equals(noExsitCode)).collect(Collectors.toList());
-			adds.addAll(adds0);
-		}
+		List<HRInfo> adds = dtos.stream()
+				.filter(item -> noExsitCodes.contains(item.getUserCode()))
+				.collect(Collectors.toList());
+
 		if(!CollectionUtils.isEmpty(adds)){
 			n = userMapper.addUserBatchs(adds);
 			System.out.println("人员新增成功条数："+ n);

op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -188,11 +188,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="addUserBatchs">
 		insert into sys_user
 		(user_name,nick_name,
-		post,section,
+		post,section,dept_id,
 		create_by,create_time,del_flag)
 		VALUES
 		<foreach collection="list" index="index" item="item" separator=",">
-			(#{item.userCode},#{item.userName},#{item.post},#{item.section},
+			(#{item.userCode},#{item.userName},#{item.post},
+			 #{item.section},#{item.deptId},
 			#{item.createBy},#{item.createTime},'0')
 		</foreach>
 	</insert>
@@ -274,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getExsitCodes" resultType="java.lang.String">
 		select user_name from sys_user where user_name in
 		<foreach collection="list" item="code" open="(" separator="," close=")">
-			#{userCode}
+			#{code}
 		</foreach>
 	</select>
 </mapper>