bug7512

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -1206,14 +1206,11 @@
         tmc.cus_code AS "cusCode",
         T.cus_name AS "cusName",
         T.cus_phone AS "cusPhone",
-        T.address_area AS "addressArea",
         T.address_name AS "addressName",
-        T.address_no AS "addressNo",
         T.address_full AS "addressFull",
         T.sales_channel AS "salesChannel",
         tmsc.channel_name AS "channelName",
         T.delivery_date AS "deliveryDate",
-        T.sale_discount AS "saleDiscount",
         T.order_status AS "orderStatus",
         sys.f_get_name_i18n ( tdk2.kind_name_i18n, #{ i18n } ) AS "orderStatusName",
         T.out_status AS "outStatus",
@@ -1223,23 +1220,16 @@
         toi.item_id AS "itemId",
         T.order_id AS "orderId",
         T.order_no AS "orderNo",
-        toi.item_index AS "itemIndex",
         toi.sku_id AS "skuId",
         toi.item_qty AS "itemQty",
-        toi.price_std AS "priceStd",
-        toi.amt_std AS "amtStd",
-        toi.price_sale AS "priceSale",
-        toi.item_amt AS "itemAmt",
-        toi.price_discount AS "priceDiscount",
         toi.non_std_code AS "nonStdCode",
+        toi.purchase_qty AS "purchaseQty",
         toi.item_qty - toi.purchase_qty AS "transferableQuantity",
-        toi.remarks AS "remarks",
         toi.cp_id AS "cpId",
         tmgs.sku_code AS "skuCode",
         tmgs.sku_model AS "skuModel",
         tmgs.sku_name AS "skuName",
         tmgb.brand_name AS "brandName",
-        tmgb.short_name AS "shortName",
         tmgs.price_purchase AS "pricePurchase",
         tmgs.price_standard AS "priceStandard",
         toi.unit_id AS "unitId",

src/main/java/com/dk/mdm/service/mst/SaleChannelService.java

@@ -3,25 +3,23 @@ package com.dk.mdm.service.mst;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
+import com.dk.common.service.BaseService;
 import com.dk.mdm.infrastructure.convert.mst.SaleChannelConvert;
 import com.dk.mdm.infrastructure.util.AuthUtils;
-import com.dk.mdm.model.pojo.mst.SaleChannel;
 import com.dk.mdm.mapper.mst.SaleChannelMapper;
-import com.dk.common.service.BaseService;
-import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.mst.Warehouse;
+import com.dk.mdm.model.pojo.mst.SaleChannel;
 import com.dk.mdm.model.query.mst.SaleChannelQuery;
 import com.dk.mdm.model.response.mst.SaleChannelResponse;
 import com.dk.mdm.model.response.mst.WarehouseResponse;
 import com.dk.mdm.model.vo.mst.SaleChannelVO;
-import com.dk.mdm.model.vo.mst.WarehouseVO;
 import com.dk.mdm.service.common.CommonService;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -129,6 +127,11 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 			saleChannelMapper.updateFlgDefault(saleChannelVO.getCpId());
 		}
 		SaleChannel saleChannel = saleChannelConvert.convertToPo(saleChannelVO);
+		//如果是默认，则取消其他默认
+		if(saleChannel.getFlgDefault() != null && saleChannel.getFlgDefault()){
+			//默认  把其他置为非默认
+			saleChannelMapper.updateFlgDefault(authUtils.getStaff().getCpId());
+		}
 		super.updateByUuid(saleChannel);
 		return ResponseResultUtil.success();
 	}

src/main/java/com/dk/mdm/service/mst/WarehouseService.java

@@ -110,6 +110,11 @@ public class WarehouseService extends BaseService<Warehouse> {
             warehouseMapper.updateFlgDefault(warehouseVO.getCpId());
         }
         Warehouse warehouse = warehouseConvert.convertToPo(warehouseVO);
+        //如果是默认，则取消其他默认
+        if(warehouse.getFlgDefault() != null && warehouse.getFlgDefault()){
+            //默认  把其他置为非默认
+            warehouseMapper.updateFlgDefault(authUtils.getStaff().getCpId());
+        }
         super.updateByUuid(warehouse);
         return ResponseResultUtil.success();
     }