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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1371,8 +1371,8 @@
         lds.signing_status AS state,
         lds.create_time AS createTime,
         lds.update_time AS updateTime,
-        lds.signee_id AS signUserId,
+        lds.examine_user_id AS signUserId,
-        lds.signee_name AS signUserName
+        lds.examine_user_name AS signUserName
         FROM
         logpm_distribution_signfor AS lds
         LEFT JOIN	logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id AND ldr.is_deleted = 0

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -353,8 +353,11 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			}
 
 			DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
+
 			BeanUtil.copyProperties(entity, distributionStockListInfo);
 			distributionStockListInfo.setSourceType("2");//导入
+			distributionStockListInfo.setQuantityStock(num);
+			distributionStockListInfo.setId(null);
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}