楚江erp：获取生产工艺历史数据逻辑调整

@@ -858,70 +858,39 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isEmpty(orderLineList)) {
             throw new DefaultClientException("订货单物料行数据不存在！");
         }
+        List<String> proProcessList = new ArrayList<>();
         String orderingUnit = orderInfo.getOrderingUnit();
         String workshopId = orderInfo.getWorkshopId();
-        List<String> industryList = new ArrayList<>();
-        List<String> brandList = new ArrayList<>();
-        List<String> statusList = new ArrayList<>();
-        List<BigDecimal> thicknessList = new ArrayList<>();
-        List<BigDecimal> thicknessTolNegList = new ArrayList<>();
-        List<BigDecimal> thicknessTolPosList = new ArrayList<>();
-        List<BigDecimal> widthList = new ArrayList<>();
-        List<BigDecimal> widthTolNegList = new ArrayList<>();
-        List<BigDecimal> widthTolPosList = new ArrayList<>();
         for (PurchaseOrderLine orderLine : orderLineList) {
             String industry = orderLine.getIndustry();
-            if (StringUtils.isNotBlank(industry) && !industryList.contains(industry)) {
-                industryList.add(industry);
-            }
             String brand = orderLine.getBrand();
-            if (StringUtils.isNotBlank(brand) && !brandList.contains(brand)) {
-                brandList.add(brand);
-            }
             String status = orderLine.getStatus();
-            if (StringUtils.isNotBlank(status) && !statusList.contains(status)) {
-                statusList.add(status);
-            }
             BigDecimal thickness = orderLine.getThickness();
-            if (thickness != null && !isValueExists(thicknessList, thickness)) {
-                thicknessList.add(thickness);
-            }
             BigDecimal thicknessTolNeg = orderLine.getThicknessTolNeg();
-            if (thicknessTolNeg != null && !isValueExists(thicknessTolNegList, thicknessTolNeg)) {
-                thicknessTolNegList.add(thicknessTolNeg);
-            }
             BigDecimal thicknessTolPos = orderLine.getThicknessTolPos();
-            if (thicknessTolPos != null && !isValueExists(thicknessTolPosList, thicknessTolPos)) {
-                thicknessTolPosList.add(thicknessTolPos);
-            }
             BigDecimal width = orderLine.getWidth();
-            if (width != null && !isValueExists(widthList, width)) {
-                widthList.add(width);
-            }
             BigDecimal widthTolNeg = orderLine.getWidthTolNeg();
-            if (widthTolNeg != null && !isValueExists(widthTolNegList, widthTolNeg)) {
-                widthTolNegList.add(widthTolNeg);
-            }
             BigDecimal widthTolPos = orderLine.getWidthTolPos();
-            if (widthTolPos != null && !isValueExists(widthTolPosList, widthTolPos)) {
-                widthTolPosList.add(widthTolPos);
+
+            Map<String, Object> params = new HashMap<>();
+            params.put("orderId", orderId);
+            params.put("orderingUnit", orderingUnit);
+            params.put("workshopId", workshopId);
+            params.put("industry", industry);
+            params.put("brand", brand);
+            params.put("status", status);
+            params.put("thickness", thickness);
+            params.put("thicknessTolNeg", thicknessTolNeg);
+            params.put("thicknessTolPos", thicknessTolPos);
+            params.put("width", width);
+            params.put("widthTolNeg", widthTolNeg);
+            params.put("widthTolPos", widthTolPos);
+
+            String proProcess = getBaseMapper().queryHisProProcess(params);
+            if (StringUtils.isNotBlank(proProcess) && !proProcessList.contains(proProcess)) {
+                proProcessList.add(proProcess);
             }
         }
-        Map<String, Object> params = new HashMap<>();
-        params.put("orderId", orderId);
-        params.put("orderingUnit", orderingUnit);
-        params.put("workshopId", workshopId);
-        params.put("industryList", industryList);
-        params.put("brandList", brandList);
-        params.put("statusList", statusList);
-        params.put("thicknessList", thicknessList);
-        params.put("thicknessTolNegList", thicknessTolNegList);
-        params.put("thicknessTolPosList", thicknessTolPosList);
-        params.put("widthList", widthList);
-        params.put("widthTolNegList", widthTolNegList);
-        params.put("widthTolPosList", widthTolPosList);
-
-        List<String> proProcessList = getBaseMapper().queryHisProProcess(params);
         if (CollectionUtils.isEmpty(proProcessList)) {
             return "";
         }

@@ -52,5 +52,5 @@ public interface PurchaseOrderInfoMapper extends BaseMapper<PurchaseOrderInfo> {
      * @param params    查询参数
      * @return          List<String>
      */
-    List<String> queryHisProProcess(@Param("params") Map<String, Object> params);
+    String queryHisProProcess(@Param("params") Map<String, Object> params);
 }

@@ -296,105 +296,78 @@
         where o.ordering_unit = #{params.orderingUnit} and o.workshop_id = #{params.workshopId}
         and o.production_process is not null
         <choose>
-            <when test="params.industryList != null and params.industryList.size() > 0">
-                and ol.industry in
-                <foreach collection="params.industryList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.industry != null and params.industry != ''">
+                and ol.industry = #{params.industry}
             </when>
             <otherwise>
                 and (ol.industry is null or ol.industry = '')
             </otherwise>
         </choose>
         <choose>
-            <when test="params.brandList != null and params.brandList.size() > 0">
-                and ol.brand in
-                <foreach collection="params.brandList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.brand != null and params.brand != ''">
+                and ol.brand = #{params.brand}
             </when>
             <otherwise>
                 and (ol.brand is null or ol.brand = '')
             </otherwise>
         </choose>
         <choose>
-            <when test="params.statusList != null and params.statusList.size() > 0">
-                and ol.status in
-                <foreach collection="params.statusList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.status != null and params.status != ''">
+                and ol.status = #{params.status}
             </when>
             <otherwise>
                 and (ol.status is null or ol.status = '')
             </otherwise>
         </choose>
         <choose>
-            <when test="params.thicknessList != null and params.thicknessList.size() > 0">
-                and ol.thickness in
-                <foreach collection="params.thicknessList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.thickness != null">
+                and ol.thickness = #{params.thickness}
             </when>
             <otherwise>
                 and ol.thickness is null
             </otherwise>
         </choose>
         <choose>
-            <when test="params.thicknessTolNegList != null and params.thicknessTolNegList.size() > 0">
-                and ol.thickness_tol_neg in
-                <foreach collection="params.thicknessTolNegList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.thicknessTolNeg != null">
+                and ol.thickness_tol_neg = #{params.thicknessTolNeg}
             </when>
             <otherwise>
                 and ol.thickness_tol_neg is null
             </otherwise>
         </choose>
         <choose>
-            <when test="params.thicknessTolPosList != null and params.thicknessTolPosList.size() > 0">
-                and ol.thickness_tol_pos in
-                <foreach collection="params.thicknessTolPosList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.thicknessTolPos != null">
+                and ol.thickness_tol_pos = #{params.thicknessTolPos}
             </when>
             <otherwise>
                 and ol.thickness_tol_pos is null
             </otherwise>
         </choose>
         <choose>
-            <when test="params.widthList != null and params.widthList.size() > 0">
-                and ol.width in
-                <foreach collection="params.widthList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.width != null">
+                and ol.width = #{params.width}
             </when>
             <otherwise>
                 and ol.width is null
             </otherwise>
         </choose>
         <choose>
-            <when test="params.widthTolNegList != null and params.widthTolNegList.size() > 0">
-                and ol.width_tol_neg in
-                <foreach collection="params.widthTolNegList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.widthTolNeg != null">
+                and ol.width_tol_neg = #{params.widthTolNeg}
             </when>
             <otherwise>
                 and ol.width_tol_neg is null
             </otherwise>
         </choose>
         <choose>
-            <when test="params.widthTolPosList != null and params.widthTolPosList.size() > 0">
-                and ol.width_tol_pos in
-                <foreach collection="params.widthTolPosList" open="(" separator="," close=")" item="item">
-                    #{item}
-                </foreach>
+            <when test="params.widthTolPos != null">
+                and ol.width_tol_pos = #{params.widthTolPos}
             </when>
             <otherwise>
                 and ol.width_tol_pos is null
             </otherwise>
         </choose>
-        group by o.production_process
-        order by max(o.update_time) desc
+        order by o.update_time desc
+        limit 1
     </select>
 </mapper>