feat:采购单修改加字段

zkqy-custom-business/src/main/java/com/zkqy/business/domain/Purchase.java

@@ -121,7 +121,28 @@ public class Purchase extends BaseEntity
     @Excel(name = "采购批号")
     private String lotNumber;
 
-    public void setId(String id) 
+    @Excel(name = "采购时间")
+    private String  procurementTime;
+    @Excel(name = "预计到货时间")
+    private String estimatedDeliveryTime;
+
+    public String getProcurementTime() {
+        return procurementTime;
+    }
+
+    public void setProcurementTime(String procurementTime) {
+        this.procurementTime = procurementTime;
+    }
+
+    public String getEstimatedDeliveryTime() {
+        return estimatedDeliveryTime;
+    }
+
+    public void setEstimatedDeliveryTime(String estimatedDeliveryTime) {
+        this.estimatedDeliveryTime = estimatedDeliveryTime;
+    }
+
+    public void setId(String id)
     {
         this.id = id;
     }

zkqy-custom-business/src/main/java/com/zkqy/business/domain/PurchaseInfo.java

@@ -73,7 +73,9 @@ public class PurchaseInfo extends BaseEntity
     @Excel(name = "批号")
     private String lotNumber;
 
-    public void setId(Long id) 
+
+
+    public void setId(Long id)
     {
         this.id = id;
     }

zkqy-custom-business/src/main/resources/mapper/business/PurchaseInfoMapper.xml

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskProcessKey"    column="task_process_key"    />
         <result property="taskNodeKey"    column="task_node_key"    />
         <result property="lotNumber"    column="lot_number"    />
+
+
     </resultMap>
 
     <resultMap type="com.zkqy.business.domain.vo.PurchaseInfoVo" id="PurchaseInfoResultVo">

zkqy-custom-business/src/main/resources/mapper/business/PurchaseMapper.xml

@@ -37,10 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskNodeKey"    column="task_node_key"    />
         <result property="processKey"    column="process_key"    />
         <result property="lotNumber"    column="lot_number"    />
+        <result property="procurementTime"    column="procurement_time"    />
+        <result property="estimatedDeliveryTime"    column="estimated_delivery_time"    />
     </resultMap>
 
     <sql id="selectPurchaseVo">
-        select id, serial_number, buy_name, supplier_no, use_department, use_department_id, declarant, reviewer, reviewer_state, reviewer_notes, approver, approver_state, approver_noets, materiel_id, units, specification, quantity, unit_price, amount, data_approval_status, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key, process_key, lot_number from {DBNAME}.purchase
+        select id, serial_number, buy_name, supplier_no, use_department, use_department_id, declarant, reviewer, reviewer_state, reviewer_notes, approver, approver_state, approver_noets, materiel_id, units, specification, quantity, unit_price, amount, data_approval_status, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key, process_key, lot_number,procurement_time,estimated_delivery_time from {DBNAME}.purchase
     </sql>
 
     <select id="selectPurchaseList" parameterType="com.zkqy.business.domain.Purchase" resultMap="PurchaseResult">

zkqy-custom-business/src/main/resources/mapper/business/SupplierMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplierVo">
-        select id, supplier_no, supplier_name, abutment_by, abutment, contact_number, representative, address, state, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key from supplier
+        select id, supplier_no, supplier_name, abutment_by, abutment, contact_number, representative, address, state, remark, create_by_id, create_by, create_time, update_by_id, update_by, update_time, del_flag, task_process_key, task_node_key from {DBNAME}.supplier
     </sql>
 
     <select id="selectSupplierList" parameterType="Supplier" resultMap="SupplierResult">
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertSupplier" parameterType="Supplier" useGeneratedKeys="true" keyProperty="id">
-        insert into supplier
+        insert into {DBNAME}.supplier
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="supplierNo != null">supplier_no,</if>
             <if test="supplierName != null">supplier_name,</if>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateSupplier" parameterType="Supplier">
-        update supplier
+        update {DBNAME}.supplier
         <trim prefix="SET" suffixOverrides=",">
             <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
             <if test="supplierName != null">supplier_name = #{supplierName},</if>
@@ -123,11 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteSupplierById" parameterType="Long">
-        delete from supplier where id = #{id}
+        delete from {DBNAME}.supplier where id = #{id}
     </delete>
 
     <delete id="deleteSupplierByIds" parameterType="String">
-        delete from supplier where id in 
+        delete from {DBNAME}.supplier where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -379,7 +379,28 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="采购时间：" prop="supplier">
+                  <el-date-picker
+                    v-model="insertFormData.procurementTime"
+                    type="date"
+                    placeholder="选择采购时间">
+                  </el-date-picker>
+              </el-form-item>
 
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="预计到货时间：" prop="lotNumber">
+                <el-date-picker
+                  v-model="insertFormData.estimatedDeliveryTime"
+                  type="date"
+                  placeholder="选择预计到货时间">
+                </el-date-picker>
+              </el-form-item>
+
+            </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
                 <el-input
@@ -834,11 +855,15 @@ export default {
         materielSpecies: 1,
       }).then((res) => {
         this.materiels = res.data;
+        this.materiels.forEach(item=>{
+          item.materielName=item.materieEncoding+item.materieColorNumber+item.specificationModel;
+        })
       });
     },
     //供应商信息
     getListSupplier() {
       getListSupplier().then((res) => {
+
         this.suppliers = res.data;
       });
     },