Merge remote-tracking branch 'origin/master'

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -947,7 +947,7 @@
         ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
         ZNU.FULL_NAME CREATED_USER,
         ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
-        SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
+        LISTAGG(NCT.DESCRIPTION , ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO) NC_CODE_DESCRIPTION
         FROM Z_ABNORMAL_BILL ZAB
         LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE
         LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
@@ -982,7 +982,7 @@
                 <if test="abnormalBill.status == 'COMP'.toString()">
                     AND zab.PROGRAM = 'true' AND zab.CORRECTION = 'true' AND zab.status != 'G'
                 </if>
-                <if test="abnormalBill.status == ''">
+                <if test="abnormalBill.status == '' and abnormalBill.type == 'Z'.toString()">
                     AND zab.STATUS != 'Q' AND zab.STATUS != 'G'
                 </if>
                 <if test="abnormalBill.startDateTime != null ">

common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java

@@ -49,7 +49,7 @@ public class ExportAspect {
         String exportCode = "";
         //-------------------------------------------------------------------------------------------------------------------
         if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed();
-        Boolean isDuoDuo = (args != null && (args.length == 1 && args[0].getClass() != String.class)) ? false : true;
+        Boolean isDuoDuo = (args != null && (args.length == 1 && args[0] != null && args[0].getClass() != String.class)) ? false : true;
         //-------------------------------------------------------------------------------------------------------------------
         request.setCharacterEncoding("UTF-8");
         //-------------------------------------------------------------------------------------------------------------------

production/src/main/java/com/foreverwin/mesnac/production/controller/WorkShopTransferController.java

@@ -126,25 +126,15 @@ public class WorkShopTransferController {
     }
 
     /**
-     * 分页查询数据
-     *
-     * @param frontPage  分页信息
-     * @return
      */
     @ResponseBody
     @GetMapping("/transferNo")
-    public R getTransferNo(FrontPage<WorkShopTransfer> frontPage, WorkShopTransfer workShopTransfer){
+    public R getTransferNo(WorkShopTransfer workShopTransfer){
-        IPage result;
+        List result;
         QueryWrapper<WorkShopTransfer> queryWrapper = new QueryWrapper<>();
         workShopTransfer.setSite(CommonMethods.getSite());
         queryWrapper.setEntity(workShopTransfer);
-        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+        result = workShopTransferMapper.getTransferNo(queryWrapper);
-            //TODO modify global query
-            queryWrapper.lambda().and(wrapper -> wrapper
-                .like(WorkShopTransfer::getTransferNo, frontPage.getGlobalQuery())
-    );
-        }
-        result = workShopTransferMapper.getTransferNo(frontPage.getPagePlus(), queryWrapper);
         return R.ok(result);
     }
 

production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java

@@ -1,11 +1,9 @@
 package com.foreverwin.mesnac.production.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.production.dto.WorkShopTransferDto;
 import com.foreverwin.mesnac.production.model.WorkShopTransfer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,5 +27,5 @@ public interface WorkShopTransferMapper extends BaseMapper<WorkShopTransfer> {
     List<WorkShopTransferDto> getInList(@Param("site") String site, @Param("workCenter") String workCenter,@Param("transferWorkCenter")  String transferWorkCenter, @Param("transferNo") String transferNo, @Param("status") String status,@Param("sfc") String sfc);
 
 
-    IPage getTransferNo(Page<WorkShopTransfer> pagePlus, @Param("ew")QueryWrapper<WorkShopTransfer> queryWrapper);
+    List<WorkShopTransfer> getTransferNo(@Param("ew")QueryWrapper<WorkShopTransfer> queryWrapper);
 }

production/src/main/resources/mapper/WorkShopTransferMapper.xml

@@ -262,22 +262,12 @@
     </select>
 
     <select id="getTransferNo" resultMap="BaseResultMap">
-        SELECT DISTINCT TRANSFER_NO FROM Z_WORK_SHOP_TRANSFER
+        SELECT DISTINCT TRANSFER_NO,WCT.DESCRIPTION WORK_CENTER FROM Z_WORK_SHOP_TRANSFER ZWST
-        <where>
+        JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZWST.WORK_CENTER  AND WC.SITE = ZWST.SITE
-            <if test="ew!=null">
+        LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
-                <if test="ew.entity!=null">
+        WHERE  ZWST.site=#{ew.entity.site}
-                    <if test="ew.entity.sfcDispatchBo!=null"> AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo}</if>
+        <if test="ew.entity.transferNo!=null"> AND ZWST.TRANSFER_NO=#{ew.entity.transferNo}</if>
-                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+        <if test="ew.entity.workCenter!=null"> AND ZWST.WORK_CENTER=#{ew.entity.workCenter}</if>
-                    <if test="ew.entity.transferNo!=null"> AND TRANSFER_NO=#{ew.entity.transferNo}</if>
-                </if>
-                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    AND ${ew.sqlSegment}
-                </if>
-            </if>
-        </where>
-        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            ${ew.sqlSegment}
-        </if>
     </select>
     <select id="selectPage" resultMap="BaseResultMap">
         SELECT DISTINCT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_WORK_SHOP_TRANSFER
@@ -730,7 +720,9 @@
         LEFT JOIN OPERATION PREOP ON PREOP.OPERATION = zsd.PREPOSITION_OPERATION AND PREOP.SITE = ZSD.SITE AND PREOP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T PREOT ON PREOT.OPERATION_BO = PREOP.HANDLE AND PREOT.LOCALE ='zh'
         WHERE ZSD.SITE=#{site} AND (zsd.DISPATCH_STATUS='RELEASE' OR zsd.DISPATCH_STATUS='NEW')
+        <if test="workCenter!=null and workCenter!=''">
             AND ZSD.WORK_CENTER=#{workCenter}
+        </if>
         <if test="transferNo!=null and transferNo!=''">
             AND ZWST.TRANSFER_NO=#{transferNo}
         </if>

quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java

@@ -31,6 +31,8 @@ public class InspectionTaskManage implements Serializable {
     private LocalDateTime modifiedDateTime;
     private String fullName;
     private String resrceDescription;
+    private String operationDescription;
+    private String sfcQty;
 
     private List<InspectionTaskManageDetail> inspectionTaskDetailList;
 
@@ -233,4 +235,20 @@ public class InspectionTaskManage implements Serializable {
     public void setResrceDescription(String resrceDescription) {
         this.resrceDescription = resrceDescription;
     }
+
+    public String getOperationDescription() {
+        return operationDescription;
+    }
+
+    public void setOperationDescription(String operationDescription) {
+        this.operationDescription = operationDescription;
+    }
+
+    public String getSfcQty() {
+        return sfcQty;
+    }
+
+    public void setSfcQty(String sfcQty) {
+        this.sfcQty = sfcQty;
+    }
 }

quality/src/main/resources/mapper/InspectionTaskManageMapper.xml

@@ -17,6 +17,7 @@
         <result column="ITEM" property="item" />
         <result column="ITEM_DESCRIPTION" property="itemDescription" />
         <result column="OPERATION" property="operation" />
+        <result column="OPERATION_DESCRIPTION" property="operationDescription" />
         <result column="STEP_ID" property="stepId" />
         <result column="RESRCE" property="resrce" />
         <result column="RESULT" property="result" />
@@ -27,13 +28,19 @@
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
         <result column="FULL_NAME" property="fullName"/>
         <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
+        <result column="SFC_QTY" property="sfcQty" />
+
     </resultMap>
 
     <select id="findInspectionTask" resultMap="BaseResultMap">
         SELECT  B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
-                M.ITEM, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION
+                M.ITEM, Z.DESCRIPTION  ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
+               O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,S.QTY SFC_QTY,B.COMMENTS COMMENTS
         FROM Z_INSPECTION_TASK B
         INNER JOIN RESRCE RS ON B.SITE = RS.SITE AND RS.RESRCE = B.RESRCE
+        INNER JOIN OPERATION O ON O.OPERATION = B.OPERATION AND O.SITE = B.SITE
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
+        INNER JOIN SFC S ON S.SFC = B.SFC AND S.SITE = B.SITE
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = RS.HANDLE AND CF.ATTRIBUTE = 'CHECK_USR'
         INNER JOIN SFC S ON S.SITE = B.SITE AND S.SFC = B.SFC
         INNER JOIN SHOP_ORDER P ON P.HANDLE = S.SHOP_ORDER_BO