2024-06-13-4提交发布

yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/BpmCreateServiceFactoryImpl.java

@@ -34,12 +34,15 @@ public class BpmCreateServiceFactoryImpl implements BpmCreateServiceFactory {
      * @param copyUserId  抄送人列表,不需要传null
      * @return 流程实例ID，需回写到表单对象中
      */
-    public String createBmp(Long userId, Long orderFormId, String workFlowKey, String businessNo, String[] copyUserId) {
+    public String createBmp(Long userId, Long orderFormId, String workFlowKey,
+                            String businessNo, String[] copyUserId) {
         Map<String, Object> processInstanceVariables = new HashMap<>();
         if (StrUtil.isNotBlank(businessNo)) {
             processInstanceVariables.put("businessNo", businessNo);
         }
-        String processInstanceId = processInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(workFlowKey).setVariables(processInstanceVariables).setBusinessKey(String.valueOf(orderFormId)).setCopyUserIds(copyUserId));
+        String processInstanceId =
+                processInstanceApi.createProcessInstance(userId,
+                        new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(workFlowKey).setVariables(processInstanceVariables).setBusinessKey(String.valueOf(orderFormId)).setCopyUserIds(copyUserId));
         return processInstanceId;
     }
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -2611,7 +2611,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                         null,
                         orderItemDO.getProdId(),
                         CollectionUtil.newArrayList(OrderExceptionEnum.GOODS_OVERWEIGHT_EXCEPTION.getKey(), OrderExceptionEnum.LINE_WEIGHT_EXCEPTION.getKey()));
-
+        /*
         String s = "type=" + type.toString() + " TransportId=" +
                 orderDO.getTransportId().toString() +
                 " NeedOrderInquiry=" + orderItemDO.getNeedOrderInquiry().toString();
@@ -2647,7 +2647,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             zTest z = new zTest();
             z.setTestname(s);
             z.setCreatedate(new Date());
-        }
+        }*/
         //end lanbm 2024-06-06 添加的逻辑点
 
         // 渠道重量超限异常 channel_packaging_overweight_exception

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -263,6 +263,9 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         OrderDO orderDO =
                 orderService.selectOne(OrderDO::getOrderId,
                         createReqVO.getOrderId());
+
+        //lanbm 2024-06-13 取消流程的创建
+        /*
         String bpmProcessId =
                 bpmCreateServiceFactory.createBmp(
                         SecurityFrameworkUtils.getLoginUserId(),
@@ -270,8 +273,8 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                         WorkFlowEmus.SHIPMENT_BILL_LADING.getKey(),
                         orderDO.getOrderNo(),
                         createReqVO.getCopyUserId());
-
         makeBillOfLading.setBpmProcessId(bpmProcessId);
+         */
         //lanbm 2024-05-24 修改为自动审批通过
         //ecw_make_bill_of_lading
         /*

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MakeBillOfLadingController.java

@@ -192,7 +192,8 @@ public class MakeBillOfLadingController {
         MakeBillOfLadingBackVO vResult =
                 MakeBillOfLadingConvert.INSTANCE.convert(lading);
 
-
+        //前端是根据 status 来判断的，此处逻辑可以不用理会
+        //lanbm 2024-06-13 添加注释
         if (lading.getBpmProcessId() == null ||
                 lading.getBpmProcessId().length() == 0) {
             vResult.setBpmStatus("-1");

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemReq.java

@@ -76,4 +76,9 @@ public class ReceiptItemReq extends PageParam {
      */
     private String accountNo;
 
+    /*
+     审批状态 lanbm 2024-06-13 add
+     */
+    private String status;
+
 }

yudao-module-wealth/yudao-module-wealth-rest/src/main/resources/mapper/ReceiptItem/BankReceiptDetailsMapper.xml

@@ -17,6 +17,9 @@
     <sql id="WherePage">
         <where>
             p.deleted=0
+            <if test="status != null and status != ''">
+                AND p.status=#{status}
+            </if>
             <if test="accountNo != null and accountNo != ''">
                 AND p.account_no=#{accountNo}
             </if>
@@ -38,7 +41,7 @@
             <!--收款明细提交审批日期-->
             <if test="sDate2 != null and sDate2 != '' and
              eDate2 != null and eDate2 != ''">
-                AND a.create_time BETWEEN #{sDate2} and #{eDate2})
+                AND a.create_time BETWEEN #{sDate2} and #{eDate2}
             </if>
 
             <!--收款明细提交审批通过日期-->