Merge branch 'master' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOutputProductDao.java

@@ -18,7 +18,7 @@ public interface ApsProcessOutputProductDao extends BaseMapper<ApsProcessOutputP
     @Select("SELECT * FROM aps_process_output_product WHERE  DELETED = 0 AND PRODUCTID = #{productid}")
     List<ApsProcessOutputProductDo> getProcessOutputProductByProductid(@Param("productid") String productid);
 
-    @Update("update aps_process_output_product set ROLLNUM = ROLLNUM+1 where ID = #{outputid}")
+    @Update("update aps_process_operation_out_mater set ROLLNUM = ROLLNUM+1 where ID = #{outputid}")
     void updateRollNumById(@Param("outputid") String outputid);
 }
 

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

@@ -317,7 +317,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     插单
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R insertOrder(Map<String, Object> params) throws Exception {
+        ApsUtils.checkScheduling(null);
         String productionOrderId = params.get("PRODUCTIONORDERID").toString();
         String blankOrderId = params.get("BLANKORDERID").toString();
         String deliveryDateStr = params.get("DELIVERYDATE").toString();