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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -291,7 +291,7 @@
         lwtg.tray_code trayCode,
         lwug.position_code positionCode,
         SUM(lwug.num) num,
-        GROUP_CONCAT(DISTINCT lwug.create_time SEPARATOR '、') upTime,
+        GROUP_CONCAT( DISTINCT DATE_FORMAT( lwug.create_time, '%Y-%m-%d %H:%i' ) SEPARATOR '、' ) AS upTime,
         GROUP_CONCAT(DISTINCT lwug.create_user SEPARATOR '、') upUser,
         (SELECT 		GROUP_CONCAT( DISTINCT ldsli.order_code) order_code FROM logpm_distribution_stock_list_info ldsli WHERE
         ldsli.incoming_batch = ldsl.incoming_batch

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncServiceTypeMapper.xml

@@ -6,7 +6,7 @@
     <update id="syncServiceTypeByMallName">
         UPDATE logpm_distribution_stock_article ldsa
             LEFT JOIN logpm_basicdata_client lbc ON lbc.client_name = #{mallName} AND lbc.is_deleted = 0
-            LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id
+            LEFT JOIN logpm_basicdata_store_business lbsb ON lbsb.client_id = lbc.id AND lbsb.is_deleted = 0
             SET ldsa.mall_id = COALESCE(lbc.id, ldsa.mall_id),
                 ldsa.mall_code = COALESCE(lbc.client_code, ldsa.mall_code),
                 ldsa.mall_name = COALESCE(lbc.client_name, ldsa.mall_name),

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncServiceTypeServiceImpl.java

@@ -26,6 +26,7 @@ public class SyncServiceTypeServiceImpl implements ISyncServiceTypeService {
 
 	@Override
 	public void syncServiceType(String id, String warehouseName, String mallName) {
+		//根据包件码查询出订单号
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(id);
 		if (distributionParcelListEntity==null){
 			throw new ServiceException("订单号不存在");