供应商修改价格问题。单据类型显示问题

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -276,7 +277,7 @@ public class UdiRelevanceController {
         if (customerId != 110) {
             if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) {
                 CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + "");
-                companyProductRelevanceEntity.setPrice(udiRelevanceEntity.getPrice());
+                companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
                 companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
             }
         }

api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java

@@ -22,5 +22,5 @@ public class CompanyProductRelevanceEntity {
     private String productUuid;
     private Integer udiRlIdFk;
     private String unitFk;
-    private String price;
+    private BigDecimal price;
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -31,6 +31,7 @@ public class StockOrderEntity {
     private String locStorageCode;
     private String invWarehouseCode;
     private String fromSubInvCode;
+    private String fromSubInvName;
 
     //补单单号
     private String supplementNo;

api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java

@@ -12,6 +12,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -32,7 +33,7 @@ public class CompanyProductsRelService {
                     CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
                     UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(uuid);
                     if (udiRelevanceEntity != null)
-                        companyProductRelevanceEntity.setPrice(udiRelevanceEntity.getPrice());
+                        companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
                     companyProductRelevanceEntity.setCreate_time(new Date());
                     companyProductRelevanceEntity.setUpdate_time(new Date());
                     companyProductRelevanceEntity.setAuditStatus("3");

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -191,9 +191,10 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT io_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
+        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
         left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -104,10 +104,13 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
-        SELECT stock_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bustype_local.name billTypeName FROM stock_order
+        SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
+        billTypeName,iws2.name fromSubInvName FROM stock_order
         left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
-        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub iws ON stock_order.invWarehouseCode = iws.`code`
+        LEFT JOIN inv_warehouse_sub iws2 ON stock_order.fromSubInvCode = iws2.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
@@ -264,7 +267,8 @@
         stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
         stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
         stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
-        stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms,basic_udirel.measname
+        stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc,
+        basic_products.cpms,basic_udirel.measname
         FROM stock_order
         INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`