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

blade-service/blade-los/src/main/java/org/springblade/los/business/update/service/impl/UpdateServiceImpl.java

@@ -688,6 +688,9 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 			try {
 				Date date = sdf.parse(item.getFieldValueNew());
 				fieldId.set(bills, date);
+				if ("etd,eta".contains(item.getField())){
+					bills.setBillDate(date);
+				}
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/mapper/ShoppingMallDetailMapper.xml

@@ -66,12 +66,12 @@
         fpd.inventory AS inventoryLocal,
         fpd.suggestedRetailPrice,
         (SELECT IFNULL(SUM(smd.inventory), 0.00) allInventory
-        FROM pjpf_shopping_mall_detail smd
+        FROM pjpf_shopping_mall_detail_${tenantId} smd
         WHERE smd.goods_code = fpd.goods_code
         AND smd.id != fpd.id AND smd.tenant_id = #{tenantId} AND smd.is_deleted = 0) AS inventoryShare,
         COUNT(goods_code) AS gc FROM
-        pjpf_shopping_mall_detail fpd JOIN (
-        SELECT id, min(bill_type) as bill_type from pjpf_shopping_mall_detail WHERE tenant_id = #{tenantId} and is_deleted = 0 AND sales_company_id = #{salesCompanyId} GROUP BY id
+        pjpf_shopping_mall_detail_${tenantId} fpd JOIN (
+        SELECT id, min(bill_type) as bill_type from pjpf_shopping_mall_detail_${tenantId} WHERE tenant_id = #{tenantId} and is_deleted = 0 AND sales_company_id = #{salesCompanyId} GROUP BY id
         ) spd on fpd.id = spd.id and fpd.bill_type = spd.bill_type
         WHERE
         fpd.tenant_id = #{tenantId}