diff --git a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java b/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java index 05d066a4..0c00a60e 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/aspect/ExportAspect.java +++ b/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 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"); diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java index 4ca9ed10..ea73dc73 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java @@ -58,4 +58,14 @@ public interface SfcDispatchMapper extends BaseMapper { SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch); List 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); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 94dcb17a..bd0939cb 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -714,6 +714,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl= #{stepId} + + + + UPDATE Z_SFC_DISPATCH SET DISPATCH_QTY = DISPATCH_QTY - #{splitQty} + WHERE SITE = #{site} AND SFC = #{sfc} AND DISPATCH_SEQ >= #{currentSeq} +