Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1367,7 +1367,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             productDetailDoList.add(apsProductDetailDo);
         }
         // 更新坯料计划产品明细的的生产状态
-        apsProductDetailService.updateBatchById(productDetailDoList);
+        if (productDetailDoList.size() > 0) {
+            apsProductDetailService.updateBatchById(productDetailDoList);
+        }
 //        apsProductDetailDao.updateProductstatus(apsProductionOrderIds);
     }
 

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -227,8 +227,11 @@
                 </foreach>
             </if>
             <if test="factoryId != null and factoryId != '' and factoryId != 'ALL'">and a1.TENANTID = #{factoryId}</if>
-            <if test="startTime != null ">and a1.PLANSTARTDATE &gt;= #{startTime}</if>
-            <if test="endTime != null ">and a1.PLANENDDATE &lt;= #{endTime}</if>
+
+            <if test="startTime != null and endTime != null ">
+                and (#{startTime}  between a1.PLANSTARTDATE and a1.PLANENDDATE
+                or  #{endTime}   between a1.PLANSTARTDATE and a1.PLANENDDATE)
+            </if>
             <if test="processids != null ">and a1.PROCESSID in (${processids})</if>
         </where>
         order by a1.PLANSTARTDATE asc,a1.PLANENDDATE asc

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOutputProductDo.java

@@ -177,5 +177,20 @@ public class ApsProcessOutputProductDo extends BaseDo {
      */
     private BigDecimal rolloutputdiameter;
 
+    /**
+     * 卷重要求
+     */
+    private String rollweightrequirement;
+
+    /**
+     * 卷径要求
+     */
+    private String rolldiameterrequirement;
+
+    /**
+     * 卷数要求
+     */
+    private String rollnumberrequirement;
+
     private static final long serialVersionUID = 1L;
 }