采购订单需加供应商字段，耗材字典选入时设置为为提交状态

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -9,10 +9,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
-import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.*;
-import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.entity.basic.UdiProductEntity;
-import com.glxp.api.entity.basic.UdiRlSupEntity;
 import com.glxp.api.entity.system.CompanyEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@@ -234,6 +231,11 @@ public class UdiRlSupController extends BaseController {
         if (vailResult != null)
             return ResultVOUtils.error(500, vailResult);
         companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
+
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiRelevanceEntity.setId(Long.parseLong(rlidStr));
+        udiRelevanceEntity.setLockStatus(1);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest());
         udiProductService.insertUdiInfo(udiProductEntity);

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -149,15 +149,12 @@ public class IoOrderDetailBizController extends BaseController {
 //            todo 查询产品是否已经通过认证
 
             if (isVailCert && udiRelevanceResponse.isNeedCert()) {
-
                 SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + "");
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
 
                 } else {
                     return ResultVOUtils.error(500, "产品资质证书未通过审核！");
                 }
-
-
             }
 
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -219,6 +219,11 @@ public class PurOrderController {
     }
 
 
+    public void genOrder() {
+
+    }
+
+
     /**
      * 查询采购订单列表
      */

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
+
 import lombok.Data;
 
 @Data
@@ -18,6 +20,9 @@ public class PurOrderEntity {
      */
     @TableField(value = "billNo")
     private String billNo;
+    @TableField(value = "supId")
+    private String supId;
+
 
     /**
      * 单据日期

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -145,6 +145,7 @@ public class FilterOrderRequest extends ListPageRequest {
      * 退货单管理界面：    supReturned
      * 采购入库单界面：    supPurchase
      * 发票登记界面：      supInvoice
+     * 出入库明细账    norDetail
      */
     private String actionType;
 

src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java

@@ -76,4 +76,7 @@ public class PurOrderResponse {
     private String emergency;
 
     private Date arrivalTime;
+
+    private String supId;
+    private String supName;
 }

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -24,26 +24,24 @@
         <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark"/>
         <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo"/>
         <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo"/>
+        <result column="supId" jdbcType="VARCHAR" property="supId"/>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
         createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
-    applyAuditUser, applyRemark, applyBillNo, stockOrderNo
+        applyAuditUser, applyRemark, applyBillNo, stockOrderNo,supId
     </sql>
 
 
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
             resultType="com.glxp.api.res.purchase.PurOrderResponse">
-
+        SELECT pur_order.*,
-    SELECT
-    pur_order.*,
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                auth_warehouse.NAME invName,
                auth_dept.`name`    deptName
-    FROM
+        FROM pur_order
-    pur_order
                      LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
                      LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
                      LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
@@ -53,16 +51,24 @@
                 AND billNo = #{billNo}
             </if>
             <if test="startDate != null and startDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
+                ]]>
             </if>
             <if test="endDate != null and endDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
+                ]]>
             </if>
             <if test="startAuditDate != null and startAuditDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
+                ]]>
             </if>
             <if test="endAuditDate != null and endAuditDate != ''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
+                ]]>
             </if>
             <if test="status != null and status != 10 and status != 11">
                 and pur_order.status = #{status}
@@ -87,8 +93,5 @@
                 AND createUser = #{createUser}
             </if>
         </where>
-
     </select>
-
-
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -76,6 +76,7 @@ CALL Pro_Temp_ColumnWork('basic_bustype_change', 'beforeTime', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bustype_change', 'busBeforeTime', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('pur_order', 'emergency', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('pur_order_detail', 'planCount', 'tinyint', 1);