车间转入转出

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

@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.production.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.production.dto.WorkShopTransferDto;
+import com.foreverwin.mesnac.production.mapper.WorkShopTransferMapper;
 import com.foreverwin.mesnac.production.model.WorkShopTransfer;
 import com.foreverwin.mesnac.production.service.WorkShopTransferService;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -24,7 +25,8 @@ public class WorkShopTransferController {
 
     @Autowired
     public WorkShopTransferService workShopTransferService;
-
+    @Autowired
+    public WorkShopTransferMapper workShopTransferMapper;
     /**
      * 查询转出数据
      *
@@ -73,6 +75,29 @@ public class WorkShopTransferController {
         workShopTransferService.transferIn(handleList);
         return R.ok();
     }
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<WorkShopTransfer> frontPage, WorkShopTransfer workShopTransfer){
+        IPage result;
+        QueryWrapper<WorkShopTransfer> queryWrapper = new QueryWrapper<>();
+        workShopTransfer.setSite(CommonMethods.getSite());
+        queryWrapper.setEntity(workShopTransfer);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                    .like(WorkShopTransfer::getTransferNo, frontPage.getGlobalQuery())
+            );
+        }
+        result = workShopTransferService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
     /**
     * 根据id查询
     *
@@ -107,8 +132,8 @@ public class WorkShopTransferController {
      * @return
      */
     @ResponseBody
-    @GetMapping("/page")
+    @GetMapping("/transferNo")
-    public R page(FrontPage<WorkShopTransfer> frontPage, WorkShopTransfer workShopTransfer){
+    public R getTransferNo(FrontPage<WorkShopTransfer> frontPage, WorkShopTransfer workShopTransfer){
         IPage result;
         QueryWrapper<WorkShopTransfer> queryWrapper = new QueryWrapper<>();
         workShopTransfer.setSite(CommonMethods.getSite());
@@ -119,7 +144,7 @@ public class WorkShopTransferController {
                 .like(WorkShopTransfer::getTransferNo, frontPage.getGlobalQuery())
     );
         }
-        result = workShopTransferService.page(frontPage.getPagePlus(), queryWrapper);
+        result = workShopTransferMapper.getTransferNo(frontPage.getPagePlus(), queryWrapper);
         return R.ok(result);
     }
 

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

@@ -1,5 +1,8 @@
 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.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;
@@ -26,4 +29,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);
 }

production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
+import com.foreverwin.mesnac.common.util.DateUtil;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.mapper.WorkCenterMapper;
@@ -29,10 +30,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -138,9 +137,7 @@ public class WorkShopTransferServiceImpl extends ServiceImpl<WorkShopTransferMap
     public List<WorkShopTransferDto> transferOut(String handleList) {
         String site = CommonMethods.getSite();
         String user = CommonMethods.getUser();
-        Date date = new Date(System.currentTimeMillis());
+        String taskNo =  DateUtil.getTimeString();
-        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
-        String taskNo = dateFormat1.format(date);
         List<WorkShopTransferDto> returnList=new ArrayList<>();
         String[] split = handleList.split(",");
         for (String sfc:split){

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

@@ -261,8 +261,26 @@
         </if>
     </select>
 
+    <select id="getTransferNo" resultMap="BaseResultMap">
+        SELECT DISTINCT TRANSFER_NO FROM Z_WORK_SHOP_TRANSFER
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.sfcDispatchBo!=null"> AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</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 <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
+        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
         <where>
             <if test="ew!=null">
                 <if test="ew.entity!=null">
@@ -643,7 +661,7 @@
      LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
      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!='COMPLETE' AND zsd.DISPATCH_STATUS!='CANCEL'
+     WHERE ZSD.SITE=#{site} AND (zsd.DISPATCH_STATUS='RELEASE' OR zsd.DISPATCH_STATUS='NEW') AND PREZSD.DISPATCH_STATUS='COMPLETE'
     <if test="stepId!=null and stepId!=''">
         AND zsd.STEP_ID=#{stepId}
     </if>
@@ -692,7 +710,7 @@
     </select>
 
     <select id="getInList" resultType="com.foreverwin.mesnac.production.dto.WorkShopTransferDto">
-        SELECT zsd.sfc,zsd.handle SFC_DISPATCH_BO,PREZSD.OPERATION NEXT_OPERATION,PREZSD.WORK_CENTER TRANSFER_WORK_CENTER,zsd.WORK_CENTER,WCT.DESCRIPTION WORK_CENTER_DESC,zsd.SHOP_ORDER,c1.VALUE WORK_ORDER,IT.DESCRIPTION ITEM_DESC,ZSD.BLANKING_SIZE,SFC.QTY,PREOT.DESCRIPTION LAST_OPERATION_DESC,PREZSD.EMPLOYEE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESC,
+        SELECT zsd.sfc,zsd.handle SFC_DISPATCH_BO,zsd.WORK_CENTER,WCT.DESCRIPTION WORK_CENTER_DESC,zsd.SHOP_ORDER,c1.VALUE WORK_ORDER,IT.DESCRIPTION ITEM_DESC,ZSD.BLANKING_SIZE,SFC.QTY,PREOT.DESCRIPTION LAST_OPERATION_DESC,OT.DESCRIPTION OPERATION_DESC,
         CASE WHEN ZWST.IS_IN='Y'  THEN '已接收'  WHEN ZWST.IS_OUT='Y'  THEN '转序中'  ELSE NULL END STATUS
         FROM Z_SFC_DISPATCH zsd
         JOIN sfc sfc ON sfc.sfc=zsd.sfc AND zsd.site=sfc.site
@@ -701,7 +719,6 @@
         left JOIN SFC_STEP SP ON SP.SFC_ROUTER_BO = SR.HANDLE  and sp.step_Id=zsd.STEP_ID
         JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZSD.WORK_CENTER  AND WC.SITE = zsd.SITE
         LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
-        LEFT JOIN Z_SFC_DISPATCH PREZSD ON zsd.SFC=PREZSD.SFC AND PREZSD.DISPATCH_SEQ=TO_NUMBER(zsd.DISPATCH_SEQ)+1
         LEFT JOIN Z_WORK_SHOP_TRANSFER ZWST ON zsd.HANDLE=zwst.SFC_DISPATCH_BO
         INNER JOIN SHOP_ORDER SO ON SO.SITE = zsd.SITE AND SO.SHOP_ORDER = zsd.SHOP_ORDER
         JOIN OPERATION OP ON OP.OPERATION = zsd.OPERATION AND OP.SITE = ZSD.SITE AND OP.CURRENT_REVISION = 'true'
@@ -712,11 +729,8 @@
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
         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!='COMPLETE' AND zsd.DISPATCH_STATUS!='CANCEL'
+        WHERE ZSD.SITE=#{site} AND (zsd.DISPATCH_STATUS='RELEASE' OR zsd.DISPATCH_STATUS='NEW')
         AND ZSD.WORK_CENTER=#{workCenter}
-        <if test="transferWorkCenter!=null and transferWorkCenter!=''">
-            AND PREZSD.WORK_CENTER=#{transferWorkCenter}
-        </if>
         <if test="transferNo!=null and transferNo!=''">
             AND ZWST.TRANSFER_NO=#{transferNo}
         </if>