Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/md/controller/MdWorkunitWorkerController.java

@@ -60,6 +60,22 @@ public class MdWorkunitWorkerController extends BaseController {
         List<MdWorkunitWorker> list = mdWorkunitWorkerService.selectMdWorkunitWorkerList(mdWorkunitWorker);
         return getDataTable(list);
     }
+
+
+
+    /**
+     * 查询岗位资源列表
+     */
+    @PreAuthorize("@ss.hasPermi('md:worker:list')")
+    @GetMapping("/getMdWorkunitWorkerByUserName")
+    public AjaxResult getMdWorkunitWorkerByUserName( MdWorkunitWorker mdWorkunitWorker) {
+        MdWorkunitWorker list = mdWorkunitWorkerService.getMdWorkunitWorkerByUserName(mdWorkunitWorker);
+        return  AjaxResult.success("查询成功",list);
+    }
+
+
+
+
     /**
      * 查询工作单元列表
      */

mes/src/main/java/com/ximai/mes/md/mapper/MdWorkunitWorkerMapper.java

@@ -65,4 +65,6 @@ public interface MdWorkunitWorkerMapper extends BaseMapper<MdWorkunitWorker> {
      * @return 结果
      */
     int deleteMdWorkunitWorkerByIds(Long[] ids);
+
+    MdWorkunitWorker getMdWorkunitWorkerByUserName(MdWorkunitWorker mdWorkunitWorker);
 }

mes/src/main/java/com/ximai/mes/md/service/IMdWorkunitWorkerService.java

@@ -62,4 +62,6 @@ public interface IMdWorkunitWorkerService {
     int insertObj(MdWorkunitWorker mdWorkunitWorker);
 
     int updateObj(MdWorkunitWorker mdWorkunitWorker);
+
+    MdWorkunitWorker getMdWorkunitWorkerByUserName(MdWorkunitWorker mdWorkunitWorker);
 }

mes/src/main/java/com/ximai/mes/md/service/impl/MdWorkunitWorkerServiceImpl.java

@@ -4,15 +4,18 @@ import com.ximai.common.core.domain.entity.SysDept;
 import com.ximai.common.core.domain.entity.SysUser;
 import com.ximai.common.utils.MessageUtils;
 import com.ximai.common.utils.data.ExceptionUtil;
+import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.md.domain.MdWorkunitWorker;
 import com.ximai.mes.md.mapper.MdWorkunitWorkerMapper;
 import com.ximai.mes.md.service.IMdWorkunitWorkerService;
 import com.ximai.system.mapper.SysDeptMapper;
 import com.ximai.system.service.ISysUserService;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -53,6 +56,11 @@ public class MdWorkunitWorkerServiceImpl implements IMdWorkunitWorkerService {
         return mdWorkunitWorkerMapper.selectMdWorkunitWorkerList(mdWorkunitWorker);
     }
 
+
+
+
+
+
     /**
      * 新增岗位资源
      *
@@ -126,4 +134,12 @@ public class MdWorkunitWorkerServiceImpl implements IMdWorkunitWorkerService {
         }
         return this.updateMdWorkunitWorker(mdWorkunitWorker);
     }
+
+    @Override
+    public MdWorkunitWorker getMdWorkunitWorkerByUserName(MdWorkunitWorker mdWorkunitWorker) {
+
+        ExceptionUtil.checkTrueThrowException(
+                mdWorkunitWorker.getWorkunitId() == null || StringUtils.isEmpty(mdWorkunitWorker.getUserName()), "用户名和工作单元ID不能为空");
+        return mdWorkunitWorkerMapper.getMdWorkunitWorkerByUserName(mdWorkunitWorker);
+    }
 }

mes/src/main/java/com/ximai/mes/pro/domain/ProFeedback.java

@@ -313,6 +313,18 @@ public class ProFeedback extends BaseEntity {
     private String sapRequestParam;
     private String sapResponse;
 
+    private Long abnormalId;
+
+    /** 异常类型 */
+    private String abnormalType;
+
+    /** 异常原因 */
+    private String abnormalReason;
+    /** 异常原因 备注*/
+    private String abnormalRemark;
+
+
+
     public void initValue(ProWorkorder workorder) {
         this.setWorkorderCode(workorder.getWorkorderCode());
         this.setWorkorderName(workorder.getWorkorderName());

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolution.java

@@ -203,4 +203,11 @@ public class ProProductionSolution extends BaseEntity {
      */
     @ApiModelProperty("超报")
     private Boolean surpassState;
+
+    @ApiModelProperty("主档文件上传URL")
+    private String url;
+    @ApiModelProperty("主档文件上传地址")
+    private String filePath;
+    @ApiModelProperty("主档文件名称")
+    private String originalFilename;
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProFeedbackVo.java

@@ -277,4 +277,14 @@ public class ProFeedbackVo {
     @ApiModelProperty("包装标签二维码")
     private String qrcode;
 
+
+    private Long abnormalId;
+
+    /** 异常类型 */
+    private String abnormalType;
+
+    /** 异常原因 */
+    private String abnormalReason;
+    /** 异常原因 备注*/
+    private String abnormalRemark;
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionVo.java

@@ -235,6 +235,10 @@ public class ProProductionSolutionVo implements Serializable {
     @ApiModelProperty("规格书")
     private ProProductionSolutionSpecificationSheet specificationSheet;
 
-
-
+    @ApiModelProperty("主档文件上传URL")
+    private String url;
+    @ApiModelProperty("主档文件上传地址")
+    private String filePath;
+    @ApiModelProperty("主档文件名称")
+    private String originalFilename;
 }

mes/src/main/java/com/ximai/mes/pro/schedule/impl/busi/ProductQrcodeBuild.java

 package com.ximai.mes.pro.schedule.impl.busi;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.common.utils.data.ExceptionUtil;
 import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.pro.domain.ProProductQrcodeRule;
 import com.ximai.mes.pro.dto.ProProductQrcodeRecordCreate;
@@ -52,8 +53,11 @@ public class ProductQrcodeBuild implements ScheduleBusiProcess{
                 }
                 if(list != null && list.size() > 0){
                     proProductQrcodeRuleDto = list.get(0);
-                }else{
+                }
+                if (proProductQrcodeRuleDto == null || StringUtils.isEmpty(proProductQrcodeRuleDto.getTemplateName())){
                     //后续再看是否需要报错
+                    ExceptionUtil.checkTrueThrowException(true,
+                            "未能匹配到打印模板，请先到产品二维码规则维护");
                 }
                 List<String> qrcodes = productQrcodeRuleService.buildQrcode(rule, job.getQuantity().intValue());
                 for(String qrcode : qrcodes){

mes/src/main/resources/mapper/md/MdWorkunitWorkerMapper.xml

@@ -54,6 +54,13 @@
         <include refid="selectMdWorkunitWorkerVo"/>
         where id = #{id}
     </select>
+    <select id="getMdWorkunitWorkerByUserName" resultType="com.ximai.mes.md.domain.MdWorkunitWorker">
+        <include refid="selectMdWorkunitWorkerVo"/>
+        <where>
+            <if test="workunitId != null ">and t1.workunit_id = #{workunitId}</if>
+            <if test="userName != null  and userName != ''">and user_name = #{userName}</if>
+        </where>
+    </select>
 
     <insert id="insertMdWorkunitWorker" parameterType="MdWorkunitWorker" useGeneratedKeys="true" keyProperty="id">
         insert into md_workunit_worker

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -109,7 +109,11 @@
                f.qrcode,
 --                ptap.assist_process_code,
                f.update_time,
-               it.sap_item_code
+               it.sap_item_code,
+               f.abnormal_id,
+               f.abnormal_type,
+               f.abnormal_reason,
+               f.abnormal_remark
         from pro_feedback f
 --                  left join pro_task_assist_process ptap on f.task_workunit_id = ptap.task_workunit_id
                  left join pro_task pt on f.task_id = pt.task_id
@@ -221,6 +225,10 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="abnormalId != null">abnormal_id,</if>
+            <if test="abnormalType != null">abnormal_type,</if>
+            <if test="abnormalReason != null">abnormal_reason,</if>
+            <if test="abnormalRemark != null">abnormal_remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="feedbackType !=null ">#{feedbackType},</if>
@@ -276,6 +284,10 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="abnormalId != null">#{abnormalId},</if>
+            <if test="abnormalType != null">#{abnormalType},</if>
+            <if test="abnormalReason != null">#{abnormalReason},</if>
+            <if test="abnormalRemark != null">#{abnormalRemark},</if>
         </trim>
     </insert>
 
@@ -333,6 +345,10 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="abnormalId != null">abnormal_id = #{abnormalId},</if>
+            <if test="abnormalType != null">abnormal_type = #{abnormalType},</if>
+            <if test="abnormalReason != null">abnormal_reason = #{abnormalReason},</if>
+            <if test="abnormalRemark != null">abnormal_remark = #{abnormalRemark},</if>
         </trim>
         where record_id = #{recordId}
     </update>

mes/src/main/resources/mapper/pro/ProProductQrcodeRuleMapper.xml

@@ -136,6 +136,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="templateId != null">
+                template_Id = #{templateId,jdbcType=BIGINT},
+            </if>
+            <if test="templateCode != null">
+                template_Code =   #{templateCode,jdbcType=VARCHAR},
+            </if>
+            <if test="templateName != null">
+                template_Name =   #{templateName,jdbcType=VARCHAR},
+            </if>
+            <if test="templateType != null">
+                template_Type =  #{templateType,jdbcType=VARCHAR},
+            </if>
         </trim>
         where rule_id = #{ruleId}
     </update>

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionMapper.xml

@@ -73,7 +73,10 @@
                pps.ecn_code,
                pps.sap_usage_id,
                pps.unit_Price,
-               pps.surpass_state
+               pps.surpass_state,
+               pps.url,
+               pps.file_path,
+               pps.original_filename
         from pro_production_solution pps
                  left join md_item mi on pps.item_id = mi.item_id
                  left join pro_route pr on pr.route_id = pps.route_id
@@ -225,6 +228,9 @@
             <if test="sapPrototypeMakeCode != null">sap_prototype_make_code = #{sapPrototypeMakeCode},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
             <if test="surpassState != null">surpass_state = #{surpassState},</if>
+            url = #{url},
+            file_path = #{filePath},
+            original_filename = #{originalFilename}
         </trim>
         where production_solution_id = #{productionSolutionId}
     </update>