Merge remote-tracking branch 'origin/master'

op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BaseBomDTO.java

@@ -104,6 +104,15 @@ public class BaseBomDTO extends BaseEntity {
 	private String productCode;
 	private String workorderCode;
 	private String parentOrder;
+	private String productType;
+
+	public String getProductType() {
+		return productType;
+	}
+
+	public void setProductType(String productType) {
+		this.productType = productType;
+	}
 
 	public String getParentOrder() {
 		return parentOrder;

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java

@@ -209,6 +209,7 @@ public class MesReportWork extends BaseEntity {
 	//版本
 	private String version;
 	private String sapCode;
+	private String remark;
 
 	public String getSapCode() {
 		return sapCode;

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -144,4 +144,6 @@ public interface MesReportWorkMapper {
     List<MesReportWorkConsume> getUpdateAttr1Boms(MesReportWork workorderCode);
 
     int updateAttr2(MesReportWork workorder);
+
+    void updateReportRemark(@Param("list") List<MesReportWork> mesReportWork);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -471,6 +471,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         }
         sapRFW.setLt_hwList(lt_hwList);
         sapRFW.setAnzma(workOrder.getSapCode());//产线编号
+        sapRFW.setRemark(workOrder.getRemark());//产线编号
         logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW));
         R r = remoteSapService.sapRFWOrder(sapRFW);
         logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg());

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -8,7 +8,6 @@ import java.util.*;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.op.common.core.constant.SecurityConstants;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.ServletUtils;
@@ -173,6 +172,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		mesReportWork.setParentOrder("0");
 		List<MesReportWork> liblist0 = mesReportWorkMapper.getReportList(mesReportWork);
 		pTabs.setLibList(liblist0);
+		pTabs.setRemark(liblist0.get(0).getRemark());
 		tabs.add(pTabs);
 
 		ProOrderWorkorder sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(mesReportWork.getWorkorderCode());
@@ -185,6 +185,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setWorkorderCode(sonWorkOrder.getParentOrder());
 			List<MesReportWork> liblist = mesReportWorkMapper.getReportList(mesReportWork);
 			sTabs.setLibList(liblist);
+			sTabs.setRemark(liblist.get(0).getRemark());
 			tabs.add(sTabs);
 
 			sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(sonWorkOrder.getWorkorderCode());
@@ -258,6 +259,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateTime(nowTime);
 			mesReportWork.setUpdateBy(updateBy);
 		}
+		//会更新好几次//着急发布后面再说
+		mesReportWorkMapper.updateReportRemark(mesReportWorks);
+
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml

@@ -93,6 +93,9 @@
             where workorder_code = #{parentOrder} or parent_order = #{parentOrder} and del_flag='0'
         )
         </if>
+        <if test='productType == "bcp"'>
+            and bp.product_code like '00000004%'
+        </if>
     </select>
     <select id="getTeamList" resultType="com.op.system.api.domain.mes.BaseTeamTDTO">
 		select Team_Code teamCode,

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -538,7 +538,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mrw.work_time workTime,
 			mrw.use_man useMan,
 			mrw.create_time createTime,
-			pow.workorder_code_sap workorderCodeSap
+			pow.workorder_code_sap workorderCodeSap,
+		    mrw.remark
 		from mes_report_work mrw
 		left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
 		where mrw.del_flag='0' and pow.del_flag = '0'
@@ -575,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mrw.product_name productName,
 		    mrw.sac1,
 		    mrw.sac2,
+		    mrw.remark,
 			equ.sap_code sapCode
 		from (
 				 select
@@ -583,12 +585,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				     sum(work_time) sac1,
 					 sum(work_time*use_man) sac2,
 					 product_code,
-					 product_name
+					 product_name,
+				     remark
 				 from
 					 mes_report_work
 				 where upload_status != #{uploadStatus} and prod_type = #{prodType}
 			and workorder_code =  #{workorderCode}
-				 group by workorder_code,product_code,product_name
+				 group by workorder_code,product_code,product_name,remark
 		) mrw
 		left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code
 		left join base_equipment equ on equ.equipment_code = ow.workorder_name
@@ -882,6 +885,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            set attr2 = '1'
 		where parent_order = #{workorderCode} and attr1= '1'
 	</update>
+	<update id="updateReportRemark">
+		<foreach collection="list" item="item" separator=";">
+			update mes_report_work set remark = #{item.remark}
+			where workorder_code = #{item.workorderCode}
+		</foreach>
+	</update>
 
 	<delete id="deleteMesReportWorkById" parameterType="String">
 		update mes_report_work set del_flag = '1' where id = #{id}

op-modules/op-quality/src/main/java/com/op/quality/controller/QcUserMaterialController.java

@@ -3,6 +3,7 @@ package com.op.quality.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -125,4 +126,40 @@ public class QcUserMaterialController extends BaseController {
         List<QcUserMaterial> list = qcUserMaterialService.getRightList(qcUserMaterial);
         return getDataTable(list);
     }
+    /**
+     * 查询人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @GetMapping(value = "/getSelectedUsers")
+    public TableDataInfo getSelectedUsers(QcUserMaterial qcUserMaterial) {
+        startPage();
+        List<QcUserMaterial> list = qcUserMaterialService.getSelectedUsers(qcUserMaterial);
+        return  getDataTable(list);
+    }
+
+    /**
+     * 添加人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @PostMapping("/addUserBind")
+    public AjaxResult addUserBind(@RequestBody QcUserMaterial qcUserMaterial) {
+        return toAjax(qcUserMaterialService.addUserBind(qcUserMaterial));
+    }
+
+    /**
+     * 删除人员绑定信息
+     * @param qcUserMaterial
+     * @return
+     */
+    @DeleteMapping("/deleteByMaterialCode")
+    public AjaxResult deleteByMaterialCode(@RequestBody QcUserMaterial qcUserMaterial) {
+        int i = qcUserMaterialService.deleteByMaterialCode(qcUserMaterial);
+        return toAjax(i);
+    }
+
+
+
+
 }

op-modules/op-quality/src/main/java/com/op/quality/domain/QcUserMaterial.java

@@ -32,6 +32,7 @@ public class QcUserMaterial extends BaseEntity {
      */
     @Excel(name = "员工名称")
     private String userName;
+    private String deptName;
 
     /**
      * 物料编码
@@ -280,6 +281,14 @@ public class QcUserMaterial extends BaseEntity {
         this.userNames = userNames;
     }
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcUserMaterialMapper.java

@@ -78,4 +78,8 @@ public interface QcUserMaterialMapper {
     public List<QcUserMaterial> getUserMaterialListUndo(QcUserMaterial qcUserMaterial);
 
     public List<QcUserMaterial> getUserMaterialListDo(QcUserMaterial qcUserMaterial);
+
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial);
+
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcUserMaterialService.java

@@ -77,5 +77,12 @@ public interface IQcUserMaterialService {
      */
     public int deleteQcUserMaterialByUserCode(QcUserMaterial qcUserMaterial);
 
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial);
+
     public List<QcUserMaterial> getRightList(QcUserMaterial qcUserMaterial);
+
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial);
+
+    public int addUserBind(QcUserMaterial qcUserMaterial);
+
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcUserMaterialServiceImpl.java

@@ -150,6 +150,12 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
         return qcUserMaterialMapper.deleteQcUserMaterialByUserCode(qcUserMaterial);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public int deleteByMaterialCode(QcUserMaterial qcUserMaterial) {
+        return qcUserMaterialMapper.deleteByMaterialCode(qcUserMaterial);
+    }
+
     @Override
     @DS("#header.poolName")
     public List<QcUserMaterial> getList(QcUserMaterial qcUserMaterial) {
@@ -174,4 +180,44 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
         });
         return selected;
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<QcUserMaterial> getSelectedUsers(QcUserMaterial qcUserMaterial) {
+        return qcUserMaterialMapper.getSelectedUsers(qcUserMaterial);
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public int addUserBind(QcUserMaterial qcUserMaterial) {
+        int count = 0;
+        if (qcUserMaterial.getMaterialCode() != null) {
+            QcUserMaterial qcUserMaterialDto = null;
+            Date now = DateUtils.getNowDate();
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String key = "#header.poolName";
+            String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
+            String[] userCodes = qcUserMaterial.getUserCodes();
+            String[] userNames = qcUserMaterial.getUserNames();
+            String materialCode = qcUserMaterial.getMaterialCode();
+            String materialName = qcUserMaterial.getMaterialName();
+            String user = SecurityUtils.getUsername();
+            //插入数据
+            for (int i = 0; i < userCodes.length; i++) {
+                qcUserMaterialDto = new QcUserMaterial();
+                qcUserMaterialDto.setId(IdUtils.fastSimpleUUID());
+                qcUserMaterialDto.setCreateTime(now);
+                qcUserMaterialDto.setCreateBy(user);
+                qcUserMaterialDto.setUserCode(userCodes[i]);
+                qcUserMaterialDto.setUserName(userNames[i]);
+                qcUserMaterialDto.setMaterialCode(materialCode);
+                qcUserMaterialDto.setMaterialName(materialName);
+                qcUserMaterialDto.setFactoryCode(factoryCode);
+                count += qcUserMaterialMapper.insertQcUserMaterial(qcUserMaterialDto);
+            }
+
+        }
+        return count;
+
+    }
 }

op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml

@@ -30,17 +30,21 @@
 
     <select id="selectUserList" parameterType="QcUserMaterial" resultType="com.op.quality.domain.QcUserMaterial">
         SELECT
-        user_id as userId,
+        su.user_id as userId,
-        user_name as userCode,
+        su.user_name as userCode,
-        nick_name as userName,
+        su.nick_name as userName,
-        phonenumber,
+        sd.dept_id as deptId,
-        email,
+        sd.dept_name as deptName,
-        status,
+        su.phonenumber,
-        create_time
+        su.email,
-        FROM sys_user
+        su.status,
-        WHERE del_flag = '0'
+        su.create_time
-        <if test="userName != null  and userName != ''">and nick_name like concat('%', #{userName}, '%')</if>
+        FROM sys_user su
-        <if test="phonenumber != null  and phonenumber != ''">and phonenumber like concat('%', #{phonenumber}, '%')</if>
+        LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id and sd.del_flag = '0'
+        WHERE su.del_flag = '0'
+        <if test="userName != null  and userName != ''">and su.nick_name like concat('%', #{userName}, '%')</if>
+        <if test="deptId != null">and sd.dept_id = #{deptId}</if>
+        <if test="phonenumber != null  and phonenumber != ''">and su.phonenumber like concat('%', #{phonenumber}, '%')</if>
     </select>
 
     <select id="selectQcUserMaterialList" parameterType="QcUserMaterial" resultMap="QcUserMaterialResult">
@@ -107,7 +111,11 @@
             '%')
         </if>
     </select>
-
+    <select id="getSelectedUsers" resultMap="QcUserMaterialResult">
+        select qum.user_code, qum.user_name
+        from qc_user_material qum
+        where qum.material_code = #{materialCode}
+    </select>
     <insert id="insertQcUserMaterial" parameterType="QcUserMaterial">
         insert into qc_user_material
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -177,4 +185,9 @@
             #{userCode}
         </foreach>
     </delete>
+
+    <delete id="deleteByMaterialCode" parameterType="QcUserMaterial">
+        delete from qc_user_material where user_code = #{userCode} and material_code = #{materialCode}
+    </delete>
+
 </mapper>