楚江erp: 1、发货单列表增加混合搜索；2、生成要车计划、要车单逻辑调整

@@ -102,9 +102,6 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
 
         getBaseMapper().insert(data);
 
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(vo);
-
         return data.getId();
     }
 
@@ -161,8 +158,14 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
                 , (v1, v2) -> v2));
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             // 生成要车计划
+            LocalDate requestCarDate = LocalDate.now();
             CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
-            planCreateVo.setRequestCarDate(LocalDate.now());
+            if (BooleanUtils.isTrue(shipmentsOrderInfo.getOnTimeShipment())) {
+                requestCarDate = shipmentsOrderInfo.getShipmentsDate();
+            } else if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
+                requestCarDate = shipmentsOrderInfo.getNewShipmentDate();
+            }
+            planCreateVo.setRequestCarDate(requestCarDate);
             planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
             String requestCarPlanId = create(planCreateVo);
             // 生成要车单
@@ -174,7 +177,7 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setDraftId(draftTicket.getId());
             ticketVo.setPlanId(requestCarPlanId);
             ticketVo.setPurchaseOrderId(orderInfo.getId());
-            ticketVo.setRequestCarDate(LocalDate.now());
+            ticketVo.setRequestCarDate(requestCarDate);
             ticketVo.setDeptId(orderInfo.getDeptId());
             if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
                 ticketVo.setDeliveryDate(shipmentsOrderInfo.getNewShipmentDate());

@@ -59,4 +59,11 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
     @ApiModelProperty("状态")
     private String status;
 
+    /**
+     * 搜索关键字
+     * 移动端使用
+     * 根据发货单编号和订货单位模糊搜索
+     */
+    @ApiModelProperty("搜索关键字")
+    private String searchKey;
 }

@@ -73,10 +73,16 @@
                 AND tb.status = #{vo.status}
             </if>
             <if test="vo.customerName != null and vo.customerName != ''">
-                AND c.name like concat('%', #{vo.customerName}, '%')
+                AND c.name LIKE CONCAT('%', #{vo.customerName}, '%')
             </if>
             <if test="vo.code != null and vo.code != ''">
-                AND tb.code like concat('%', #{vo.code}, '%')
+                AND tb.code LIKE CONCAT('%', #{vo.code}, '%')
+            </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (
+                    tb.code LIKE CONCAT('%', #{vo.searchKey}, '%')
+                    OR c.name LIKE CONCAT('%', #{vo.searchKey}, '%')
+                )
             </if>
         </where>
         ORDER BY tb.create_time DESC