Merge remote-tracking branch 'origin/master'

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

@@ -56,24 +56,30 @@ public class ExportAspect {
         //-------------------------------------------------------------------------------------------------------------------
         if (paramtes == null || args == null || args.length == 0) return joinPoint.proceed();
         //-------------------------------------------------------------------------------------------------------------------
+        request.setCharacterEncoding("UTF-8");
+
+        Object[] params = new Object[1];
+        Map<String, Object> paramMap = new HashMap<>();
         while (paramtes.hasMoreElements()) {
             String param = paramtes.nextElement();
             String value = request.getParameter(param);
             //-------------------------------------------------------------------------------------------------------------------
             if (param != null && param.equals("export")) export = true;
             if (param != null && param.equals("exportCode")) exportCode = value;
-            if (export && StringUtil.notEmpty(exportCode)) break;
+
+            paramMap.put(param, value);
         }//while
+        params[0] = paramMap;
         //-------------------------------------------------------------------------------------------------------------------
         if (export == false || StringUtil.isEmpty(exportCode)) return joinPoint.proceed();
         //-------------------------------------------------------------------------------------------------------------------
-        for (Object arg : args) {
+        for (Object arg : params) {
             if (arg instanceof FrontPage) {
                 ((FrontPage)arg).setRows(20000);
             }
         }//for
         //-------------------------------------------------------------------------------------------------------------------
-        Object result = joinPoint.proceed(args);
+        Object result = joinPoint.proceed(params);
         JSONObject resultJson = JSON.parseObject(JSON.toJSONStringWithDateFormat(result, "yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteDateUseDateFormat));
         if (resultJson.get("data") instanceof List) {
             List dataList = (List)resultJson.get("data");

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

@@ -58,4 +58,14 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
     SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch);
 
     List<SfcDispatch> findSplitSfcDispatch(@Param("site") String site, @Param("sfc") String sfc, @Param("stepId") int stepId);
+
+    /**
+     * 批次拆分后 修改派工单数量
+     *
+     * @param site
+     * @param sfc
+     * @param currentSeq
+     * @param splitQty
+     */
+    void updateSfcDispatchQty(@Param("site") String site, @Param("sfc") String sfc, @Param("currentSeq") int currentSeq, @Param("splitQty") Float splitQty);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -714,6 +714,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
 
             shopOrderReleaseService.sfcDispatch(site, user, shopOrderModel, sfcModel, routerList);
         }
+
+        //修改派工数量
+        sfcDispatchMapper.updateSfcDispatchQty(site, sfc, Integer.parseInt(stepSequence), new Float(sfcModel.getQty()));
     }
 
     @Override

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

@@ -824,4 +824,10 @@
         FROM Z_SFC_DISPATCH
         WHERE SITE = #{site} AND SFC = #{sfc} AND TO_NUMBER(STEP_ID) >= #{stepId}
     </select>
+
+
+    <update id="updateSfcDispatchQty" >
+        UPDATE Z_SFC_DISPATCH SET DISPATCH_QTY = DISPATCH_QTY - #{splitQty}
+        WHERE SITE = #{site} AND SFC = #{sfc} AND DISPATCH_SEQ >= #{currentSeq}
+    </update>
 </mapper>