Merge remote-tracking branch 'origin/master'

console/src/main/resources/application-dev.yml

@@ -35,3 +35,6 @@ ftp:
 print:
   server: http://localhost:8080/CodeSoftPrintWeb/printService
 
+activeMq:
+  sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
+  queue: send.weChat.notice

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java

@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.dispatch.controller;
 
 import cn.hutool.core.date.DateUtil;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
+import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -16,7 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.websocket.server.PathParam;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -320,4 +323,32 @@ public class SfcDispatchController {
             return R.failed(message.toString());
         }
     }
+
+
+    @PostMapping("/gantt-list")
+    public R ganttList(@RequestBody ShopOrderRelease shopOrderRelease) {
+        Map<String, Object> result = new HashMap<>();
+
+        try {
+            String site = CommonMethods.getSite();
+            if (StringUtil.notBlank(shopOrderRelease.getStartFromDate_S())) {
+                shopOrderRelease.setStartFromDate(DateUtil.parseDate(shopOrderRelease.getStartFromDate_S()));
+            }
+            if (StringUtil.notBlank(shopOrderRelease.getStartToDate_S())) {
+                shopOrderRelease.setStartToDate(DateUtil.parseDate(shopOrderRelease.getStartToDate_S()));
+            }
+            shopOrderRelease.setSite(site);
+
+            //查询派工数据
+            List<ShopOrderRelease> scheduleList = sfcDispatchService.findSfcDispatchList(shopOrderRelease);
+            result.put("schedules", scheduleList);
+
+            //查询工作中心工作时间
+            result.put("workCenterWorkTimes", "");
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok();
+    }
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java

@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -261,21 +261,14 @@
                     <if test="ew.entity.isFirstOperation!=null"> AND IS_FIRST_OPERATION=#{ew.entity.isFirstOperation}</if>
                     <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
-                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
-                    <if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
-                    <if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
-                    <if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
-                    <if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
-                    <if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                    AND ${ew.sqlSegment}
                 </if>
             </if>
         </where>
         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            ${ew.sqlSegment}
+            AND ${ew.sqlSegment}
         </if>
     </select>
 
@@ -976,7 +969,6 @@
         </foreach>)
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
-
     <select id="findSfcDispatch" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List" />
         FROM Z_SFC_DISPATCH