Merge remote-tracking branch 'origin/dev' into dev

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

@@ -591,11 +591,30 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/biz/updateById")
     @Log(title = "发票管理", businessType = BusinessType.UPDATE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
-
+        IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderInvoiceRequest.getOrderIdFk());
+        if (orderEntity != null) {
+            orderEntity.setUpdateTime(new Date());
+            orderService.update(orderEntity);
+        }
         return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest));
 
     }
 
+    @PostMapping("/udiwms/inout/bizDetail/updateById")
+    @Log(title = "发票管理", businessType = BusinessType.UPDATE)
+    public BaseResponse updateBizById(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
+        IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderDetailBizEntity.getOrderIdFk());
+        if (orderEntity != null) {
+            orderEntity.setUpdateTime(new Date());
+            orderService.update(orderEntity);
+        }
+        ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getFilePath());
+        ioOrderDetailBizEntity.setCheckColdFileName(ioOrderDetailBizEntity.getColdFilePath());
+        boolean b = orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
+        return ResultVOUtils.success("修改成功！");
+    }
+
+
 
     @PostMapping("/udiwms/inout/biz/insertInvoice")
     @Log(title = "发票管理", businessType = BusinessType.INSERT)

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

@@ -39,7 +39,7 @@ public class IoOrderInvoiceController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/refrshInvoice")
     @Log(title = "发票", businessType = BusinessType.INSERT)
-    public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
+    public BaseResponse refrshInvoice(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
         BaseResponse<RefreshInoiceResponse> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
         if (baseResponse.getCode() == 20000) {
             RefreshInoiceResponse refreshInoiceResponse = baseResponse.getData();

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -179,12 +179,21 @@ public class IoOrderDetailBizEntity {
     @TableField(value = "filePath")
     private String filePath;
 
+    @TableField(value = "coldFilePath")
+    private String coldFilePath;
+
     /**
      * 检验报告名称
      */
     @TableField(value = "checkFileName")
     private String checkFileName;
 
+    /**
+     * 冷链报告名称
+     */
+    @TableField(value = "checkColdFileName")
+    private String checkColdFileName;
+
 
     @TableField(exist = false)
     private boolean checkSuccess;

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

@@ -132,6 +132,9 @@ public class PurOrderEntity {
     @TableField(value = "emergency")
     private Integer emergency;
 
+    @TableField(value = "supId")
+    private String supId;
+
     /**
      * 是否已生成采购计划
      */

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -167,6 +167,11 @@ public class IoOrderDetailBizResponse {
 
     private boolean regStatus;
 
+    private String coldFilePath;
+
+    private String checkColdFileName;
+
+
 
 
 

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

@@ -73,4 +73,6 @@ public class PurOrderResponse {
     private String auditUserName;
     private Integer emergency;
     private Date arrivalTime;
+    private String supId;
+    private String supName;
 }

src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml

@@ -13,8 +13,8 @@
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
         SELECT ic.*,
-        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
-        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+               bp.cpmctymc,
+               bp.ggxh
         FROM io_order_invoice ic
                      LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
                      LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
@@ -34,7 +34,6 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -23,12 +23,14 @@
         group by io_order_detail_biz.id
     </select>
 
-    <select id="selectByinvoiceId" parameterType="java.lang.Long"  resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        select * from io_order_invoice where id= #{id}
+    <select id="selectByinvoiceId" parameterType="java.lang.Long"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select *
+        from io_order_invoice
+        where id = #{id}
     </select>
 
 
-
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,
                (select count(*)
@@ -56,8 +58,8 @@
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
         SELECT ic.*,
-        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
-        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+               bp.cpmctymc,
+               bp.ggxh
         FROM io_order_invoice ic
                      LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
                      LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
@@ -77,13 +79,13 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>
 
     <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
-        select * from io_order_detail_biz
+        select *
+        from io_order_detail_biz
         <where>
             <if test="orderId != null and orderId != ''">
                 AND orderIdFk = #{orderId}

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

@@ -35,34 +35,41 @@
 
     <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
-    pur_order
+               auth_dept.`name`    deptName,
+               basic_corp.name     supName
+        FROM 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`
                      LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
+                     left join basic_corp on pur_order.supId = basic_corp.erpId
         <where>
             <if test="billNo != '' and billNo != null">
                 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}
@@ -90,8 +97,5 @@
                 AND emergency = #{emergency}
             </if>
         </where>
-
     </select>
-
-
 </mapper>

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

@@ -37,6 +37,12 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
 
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
+
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1);
+
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1);
+
 CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
 
 CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255)  ', 1);