Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

# Conflicts:
#	src/main/java/com/dk/mdm/model/vo/mst/SaleChannelVO.java

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemCostMapper.xml

@@ -47,7 +47,7 @@
     <sql id="Condition">
         <where>
             <if test="outItemId != null and outItemId != ''">
-                AND tpoic.out_item_id = #{outItemId}
+                AND tpoic.out_item_id = #{outItemId}::uuid
             </if>
             <if test="invId != null and invId != ''">
                 AND tpoic.inv_id = #{invId}

src/main/java/com/dk/mdm/mapper/mst/SaleChannelMapper.xml

@@ -89,7 +89,9 @@
                 AND flg_valid =
                 any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
-
+            <if test="flgDefault != null">
+                AND flg_default = #{flgDefault}
+            </if>
             <if  test="searchText != null">
                 AND (channel_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  channel_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
@@ -164,6 +166,7 @@
             remarks,
             cp_id,
             op_app_code,
+            flg_default,
         </trim>
         )
         values
@@ -177,6 +180,7 @@
                 #{item.remarks},
                 #{item.cpId},
                 #{item.opAppCode},
+                #{item.flgDefault},
             </trim>
             )
         </foreach>

src/main/java/com/dk/mdm/model/vo/mst/SaleChannelVO.java

@@ -176,16 +176,6 @@ public class SaleChannelVO extends PageInfo<SaleChannelVO> implements Serializab
     private Boolean flgDefault;
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
     private List<Map<String,Object>> dataIds;
     private static final long serialVersionUID = 1L;
 

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

@@ -6,6 +6,7 @@ import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mst.WarehouseConvert;
+import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.model.pojo.mst.Warehouse;
 import com.dk.mdm.mapper.mst.WarehouseMapper;
 import com.dk.common.service.BaseService;
@@ -39,6 +40,10 @@ public class WarehouseService extends BaseService<Warehouse> {
     @Autowired
     private WarehouseConvert warehouseConvert;
 
+
+    @Autowired
+    private AuthUtils authUtils;
+
     /**
      * @desc : 重写主键
      * @author : 于继渤
@@ -79,9 +84,13 @@ public class WarehouseService extends BaseService<Warehouse> {
         Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.WAREHOUSE.getName(), true);
         warehouse.setWhId(uniqueNoteCode.get("outId").toString());
         warehouse.setWhCode(uniqueNoteCode.get("outNote").toString());
+        //新建如果是默认取消其他默认
+        if(warehouseVO.getFlgDefault()){
+            //默认  把其他置为非默认
+            warehouseMapper.updateFlgDefault(authUtils.getStaff().getCpId());
+        }
         //新建
         warehouseMapper.insert(warehouse);
-
         return ResponseResultUtil.success();
     }