采购申请追加来源

@@ -146,4 +146,6 @@ public class TblBiddingShenq implements Serializable {
 
 
     @ApiModelProperty(value = "是否从基础表选择0是 1否")
     @ApiModelProperty(value = "是否从基础表选择0是 1否")
     private String chooseStatus;
     private String chooseStatus;
+    //来源 1产品设计新增 2采购申请
+    private String source;
 }
 }

@@ -156,4 +156,7 @@ public class BiddingShenqForm implements Serializable {
     @Excel(name = "审批结果：0未通过 1通过", width = 15)
     @Excel(name = "审批结果：0未通过 1通过", width = 15)
     @ApiModelProperty(value = "审批结果：0未通过 1通过")
     @ApiModelProperty(value = "审批结果：0未通过 1通过")
     private String approvalResult;
     private String approvalResult;
+
+    //来源 1产品设计新增 2采购申请
+    private String source;
 }
 }

@@ -9,7 +9,7 @@
             a.id,a.order_id,a.part_number,a.product_name,
             a.id,a.order_id,a.part_number,a.product_name,
             a.specifications,a.type,a.appearance_size,a.num,a.danwei,a.brand,a.wu_type,
             a.specifications,a.type,a.appearance_size,a.num,a.danwei,a.brand,a.wu_type,
             a.work_order,a.purpose,a.ku,a.sq_time,a.delivery_time,a.notes,a.applicant,
             a.work_order,a.purpose,a.ku,a.sq_time,a.delivery_time,a.notes,a.applicant,
-            a.approval_status,a.approval_result,a.create_by,a.create_time,a.update_by,a.update_time,a.choose_status,
+            a.approval_status,a.approval_result,a.create_by,a.create_time,a.update_by,a.update_time,a.choose_status,a.source,
         IF
         IF
             ( a.choose_status = '0', b.oper_number, '0' ) AS oper_number
             ( a.choose_status = '0', b.oper_number, '0' ) AS oper_number
         FROM
         FROM
@@ -17,7 +17,7 @@
             LEFT JOIN view_depot_stock b ON a.part_number = b.part_number
             LEFT JOIN view_depot_stock b ON a.part_number = b.part_number
         where 1=1
         where 1=1
         <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
         <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
-            and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1')
+            and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.source = '1')
         </if>
         </if>
         <if test="biddingShenqForm.approvalStatus!=null and biddingShenqForm.approvalStatus !=''">
         <if test="biddingShenqForm.approvalStatus!=null and biddingShenqForm.approvalStatus !=''">
             and a.approval_status like concat('%',#{biddingShenqForm.approvalStatus},'%')
             and a.approval_status like concat('%',#{biddingShenqForm.approvalStatus},'%')

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 @Slf4j
 @Slf4j
@@ -99,6 +100,7 @@ public class ProductDesignController {
         List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
         List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
         for (TblBiddingShenq biddingShenq:biddingSqList){
         for (TblBiddingShenq biddingShenq:biddingSqList){
             biddingShenq.setApplicant(sysUser.getWorkNo());
             biddingShenq.setApplicant(sysUser.getWorkNo());
+            biddingShenq.setSqTime(new Date());
         }
         }
         tblBiddingShenqService.saveBatch(biddingSqList);
         tblBiddingShenqService.saveBatch(biddingSqList);
         //更新生产订单表中产品设计状态
         //更新生产订单表中产品设计状态
@@ -130,6 +132,7 @@ public class ProductDesignController {
         List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
         List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
         for (TblBiddingShenq biddingShenq:biddingSqList){
         for (TblBiddingShenq biddingShenq:biddingSqList){
             biddingShenq.setApplicant(sysUser.getWorkNo());
             biddingShenq.setApplicant(sysUser.getWorkNo());
+            biddingShenq.setSqTime(new Date());
         }
         }
         tblBiddingShenqService.saveBatch(biddingSqList);
         tblBiddingShenqService.saveBatch(biddingSqList);