diff --git a/op-modules/op-device/src/main/resources/bootstrap.yml b/op-modules/op-device/src/main/resources/bootstrap.yml
index efdd19ba..b3bf9ac1 100644
--- a/op-modules/op-device/src/main/resources/bootstrap.yml
+++ b/op-modules/op-device/src/main/resources/bootstrap.yml
@@ -13,15 +13,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
       config:
-        namespace: lanju-op
-        group: zxl
+        namespace: lanju-op-test
+        group: test
         # 服务注册地址
-        server-addr: 175.27.215.92:8848
+        server-addr: 192.168.202.20:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceController.java
index e88ee954..48997121 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceController.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.mes.domain.MesUnitPrice;
 import com.op.mes.service.IMesUnitPriceService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -88,6 +89,7 @@ public class MesUnitPriceController extends BaseController {
         return success(mesUnitPriceService.selectMesUnitPriceByPicId(picId));
     }
 
+
     /**
      * 新增unitPrice
      */
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
index f960cbbd..b8aa67ae 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesUnitPriceReportController.java
@@ -77,7 +77,7 @@ public class MesUnitPriceReportController extends BaseController {
      * 新增【计件工资统计】
      */
     @RequiresPermissions("unitPriceReport:report:add")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "新增【计件工资统计】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MesUnitpriceReport mesUnitpriceReport) {
         return toAjax(mesUnitpriceReportService.insertMesUnitpriceReport(mesUnitpriceReport));
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java
index 7ac6014d..f98f7d03 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesUnitPriceMapper.java
@@ -61,4 +61,5 @@ public interface MesUnitPriceMapper {
      * @return 结果
      */
     public int deleteMesUnitPriceByPicIds(String[] picIds);
+
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java
index d281fea3..97961d3e 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesUnitPriceService.java
@@ -62,4 +62,6 @@ public interface IMesUnitPriceService {
 
 
     public String importMesUnitPrice(List<MesUnitPrice> UnitPriceList, Boolean isUpdateSupport, String operName);
+
+
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
index df1e3f5b..4efda0ef 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
@@ -60,6 +60,8 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
     @Override
     @DS("#header.poolName")
     public List<MesUnitPrice> selectMesUnitPriceList(MesUnitPrice mesUnitPrice) {
+        //查询产线编码对应SAP编码
+
         return mesUnitPriceMapper.selectMesUnitPriceList(mesUnitPrice);
     }
 
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
index 08f2b666..6c700668 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitpriceReportServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.mes.domain.MesUnitpriceReport;
 import com.op.mes.domain.ProOrderWorkorder;
@@ -56,8 +57,9 @@ public class MesUnitpriceReportServiceImpl implements IMesUnitpriceReportService
      * @return 结果
      */
     @Override
-
+    @DS("#header.poolName")
     public int insertMesUnitpriceReport(MesUnitpriceReport mesUnitpriceReport) {
+        mesUnitpriceReport.setId(IdUtils.fastSimpleUUID());
         mesUnitpriceReport.setCreateTime(DateUtils.getNowDate());
         return mesUnitpriceReportMapper.insertMesUnitpriceReport(mesUnitpriceReport);
     }
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
index f1eb00a0..abd98282 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitPriceMapper.xml
@@ -29,31 +29,31 @@
 	</sql>
 
     <select id="selectMesUnitPriceList" parameterType="MesUnitPrice" resultMap="MesUnitPriceResult">
-        select pic_id, factory_id, product_code, product_name, line_code,
-        line_name, childprocess_id, childprocess_code, childprocess_name, attr1,
-        attr2, attr3, attr4, create_by, create_time, update_by, update_time from mes_unit_price
+        select mup.pic_id, mup.factory_id, mup.product_code, mup.product_name, mup.line_code,
+        mup.line_name, mup.childprocess_id, mup.childprocess_code, mup.childprocess_name, mup.attr1,
+        mup.attr2, mup.attr3, mup.attr4, mup.create_by, mup.create_time, mup.update_by, mup.update_time from mes_unit_price mup
         <where>
-            <if test="factoryId != null ">and factory_id = #{factoryId}</if>
-            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
-            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+            <if test="factoryId != null ">and mup.factory_id = #{factoryId}</if>
+            <if test="productCode != null  and productCode != ''">and mup.product_code = #{productCode}</if>
+            <if test="productName != null  and productName != ''">and mup.product_name like concat('%', #{productName},
                 '%')
             </if>
-            <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
-            <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
-            <if test="childprocessId != null  and childprocessId != ''">and childprocess_id = #{childprocessId}</if>
-            <if test="childprocessCode != null  and childprocessCode != ''">and childprocess_code =
+            <if test="lineCode != null  and lineCode != ''">and mup.line_code = #{lineCode}</if>
+            <if test="lineName != null  and lineName != ''">and mup.line_name like concat('%', #{lineName}, '%')</if>
+            <if test="childprocessId != null  and childprocessId != ''">and mup.childprocess_id = #{childprocessId}</if>
+            <if test="childprocessCode != null  and childprocessCode != ''">and mup.childprocess_code =
                 #{childprocessCode}
             </if>
-            <if test="childprocessName != null  and childprocessName != ''">and childprocess_name like concat('%',
+            <if test="childprocessName != null  and childprocessName != ''">and mup.childprocess_name like concat('%',
                 #{childprocessName}, '%')
             </if>
-            <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
-            <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
-            <if test="attr3 != null ">and attr3 = #{attr3}</if>
-            <if test="attr4 != null ">and attr4 = #{attr4}</if>
-            <if test="createBy != null">and create_by = #{createBy}</if>
+            <if test="attr1 != null  and attr1 != ''">and mup.attr1 = #{attr1}</if>
+            <if test="attr2 != null  and attr2 != ''">and mup.attr2 = #{attr2}</if>
+            <if test="attr3 != null ">and mup.attr3 = #{attr3}</if>
+            <if test="attr4 != null ">and mup.attr4 = #{attr4}</if>
+            <if test="createBy != null">and mup.create_by = #{createBy}</if>
         </where>
-        ORDER BY childprocess_code ASC
+        ORDER BY mup.childprocess_code ASC
     </select>
 
     <select id="selectMesUnitPriceByPicId" parameterType="String" resultMap="MesUnitPriceResult">
@@ -70,6 +70,7 @@
         </where>
     </select>
 
+
     <insert id="insertMesUnitPrice" parameterType="MesUnitPrice">
         insert into mes_unit_price
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
index e6ea172e..58b2e4ad 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesUnitpriceReportMapper.xml
@@ -117,7 +117,7 @@
                 '%')
             </if>
             <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
-            <if test="nickName != null  and nickName != ''">and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="nickName != null  and nickName != ''">and (nick_name like concat('%', #{nickName}, '%') or user_name like concat('%', #{nickName}, '%')) </if>
             <if test="childprocessCode != null  and childprocessCode != ''">and childprocess_code =
                 #{childprocessCode}
             </if>
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
index 37b80790..d50e5c37 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java
@@ -310,13 +310,36 @@ public class ProOrderWorkorder extends TreeEntity {
     @Excel(name = "母订单新编号")
     private String pworkorderCodeSap;
 
+    /**SAP产线编码*/
+    private String sapCode;
+    /**SAP产线名称*/
+    private String sapName;
+
+    public String getSapName() {
+        return sapName;
+    }
+
+    public void setSapName(String sapName) {
+        this.sapName = sapName;
+    }
+
     /**
      * $column.columnComment
      */
+
+
     private String factoryCode;
 
     private Boolean hasChildren;
 
+    public String getSapCode() {
+        return sapCode;
+    }
+
+    public void setSapCode(String sapCode) {
+        this.sapCode = sapCode;
+    }
+
     public Boolean getHasChildren() {
         return hasChildren;
     }
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 da6f78e8..e91bf44e 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
@@ -46,8 +46,8 @@
         <result property="pworkorderCodeSap" column="pworkorderCodeSap"/>
         <result property="materialCode" column="material_code"/>
         <result property="materialName" column="material_name"/>
-
-
+        <result property="sapCode" column="sap_code"/>
+        <result property="sapName" column="sap_Name"/>
     </resultMap>
 
     <sql id="selectProOrderWorkorderVo">
@@ -106,9 +106,10 @@
             pow.route_code, pow.prod_line_code, pow.product_date,
             pow.shift_id, pow.parent_order,pow.status, pow.prod_type,pow.factory_code,
             pow.end_flag,pow.car_num,pow.sort_no,
-            pow.workorder_code_sap,po.atrr2
+            pow.workorder_code_sap,po.atrr2,be.sap_code,be.sap_name
         from pro_order_workorder pow
         left join pro_order po on pow.order_id = po.id
+        left join base_equipment be on pow.workorder_name=be.equipment_code
         <where>
             <if test="workorderCode != null  and workorderCode != ''">and pow.workorder_code like concat('%',
                 #{workorderCode}, '%')
@@ -139,6 +140,7 @@
             and pow.parent_order = #{parentOrder}
             and pow.del_flag = '0'
         </where>
+        ORDER BY pow.product_date DESC
     </select>
     <select id="selectProOrderWorkorderList999" resultMap="ProOrderWorkorderResult">
         select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code, pow.product_id,
diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
index 25a03c3f..45f374ed 100644
--- a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
+++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
@@ -228,6 +228,25 @@ public class SysUserController extends BaseController {
 		return ajax;
 	}
 
+	/**
+	 * 根据工号获取详细信息
+	 */
+	@RequiresPermissions("system:user:query")
+	@PostMapping("/getInfoByUserName")
+	public AjaxResult getInfoByUserName(@RequestBody SysUser qsysUser) {
+		AjaxResult ajax = AjaxResult.success();
+		ajax.put("posts", postService.selectPostAll());
+		if (StringUtils.isNotNull(qsysUser.getUserName())) {
+			SysUser sysUser = userService.selectUserByUserName(qsysUser.getUserName());
+			if (sysUser==null){
+				return AjaxResult.error("此用户不存在！");
+			}
+			ajax.put(AjaxResult.DATA_TAG, sysUser);
+			ajax.put("postIds", postService.selectPostListByUserId(sysUser.getUserId()));
+		}
+		return ajax;
+	}
+
 	/**
 	 * 新增用户
 	 */
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 6181e7a9..c7e76bcd 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
@@ -1,5 +1,6 @@
 package com.op.system.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
@@ -644,5 +645,6 @@ public class SysUserServiceImpl implements ISysUserService {
 
 		return n;
 	}
+
 }