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

src/main/java/com/dk/mdm/controller/pur/PurchaseController.java

@@ -2,18 +2,17 @@ package com.dk.mdm.controller.pur;
 
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.model.pojo.pur.Purchase;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.pojo.pur.Purchase;
 import com.dk.mdm.model.query.pur.PurchaseQuery;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.pur.PurchaseVO;
+import com.dk.mdm.service.pur.PurchaseService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.Api;
-import com.dk.mdm.service.pur.PurchaseService;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.Map;
 
 @Api(tags = "采购订单API接口")
@@ -73,6 +72,7 @@ public class PurchaseController{
     )
     @PostMapping("insert")
     public ResponseResultVO<?> insert(@RequestBody PurchaseVO Purchasevo) {
+
         return purchaseService.insert(Purchasevo);
     }
 

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -170,6 +170,8 @@
         parent_id  AS "parentId",
         top_Id     AS "topId",
         display_no AS "displayNo",
+        level_code AS "levelCode",
+        level_no    AS "levelNo",
         remarks
         ,flg_valid as "flgValid"
         ,flg_business as "flgBusiness"
@@ -603,6 +605,9 @@
         <if test="skuName != null">
             AND tmgs.sku_name LIKE concat('%',my_ex.likequery(#{skuName}),'%')
         </if>
+        <if test="skuModel != null">
+            AND tmgs.sku_model LIKE concat('%',my_ex.likequery(#{skuModel}),'%')
+        </if>
     </select>
 
     <!-- 获取商品个数(采购) -->

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -448,13 +448,18 @@
                 AND tpp.into_status =
                 any(#{intoStatusList,typeHandler=StringListTypeHandler})
             </if>
-            <if test="skuName != null and skuName!='' ">
+            <if test="(skuName != null and skuName!='') or (skuModel != null and skuModel!='')">
                 and exists (select 1 from dkic_b.t_psi_purchase_item tppi
                 left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tppi.sku_id
                 where
                 tpp.pur_id = tppi.pur_id
                 and tppi.flg_valid
-                AND position(#{skuName} in tmgs.sku_name) > 0
+                <if test="skuName != null and skuName!=''">
+                    AND position(#{skuName} in tmgs.sku_name) > 0
+                </if>
+                <if test="skuModel != null and skuModel!=''">
+                    AND position(#{skuModel} in tmgs.sku_model) > 0
+                </if>
                 )
             </if>
             <if test="pickupDateStart != null">

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

@@ -114,6 +114,8 @@
         <result column="cost_price" property="costPrice"/>
         <result column="cost_amt" property="costAmt"/>
         <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+        <result column="price_purchase" property="pricePurchase"/>
+
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -665,9 +667,13 @@
         SELECT t.item_id,
         t.order_id,
         tpo.order_no,
+        tms.cus_code,
+        tms.cus_name,
+        tms.cus_phone,
+        tpo.make_time AS "makingTime",
         t.item_index,
         t.sku_id,
-        tmgs.sku_code  as "skuCode",
+        tmgs.sku_code,
         tmgs.sku_model as "skuModel",
         tmgs.sku_name  as "skuName",
         sys.f_remove_zero(t.item_qty) as item_qty,
@@ -680,7 +686,7 @@
         t.fact_amt,
         t.use_place,
         t.discount,
-        t.non_std_code,
+        t.non_std_code AS "nonStdCode",
         t.out_status,
         sys.f_remove_zero(t.outing_qty) as outing_qty,
         t.outing_amt,
@@ -699,8 +705,10 @@
         ,ul.unit_name         as "unitName"
         ,u2.unit_name         as "subUnitName"
         ,dkic_b.f_box_piece(u2.unit_name,ul.unit_name,t.box,t.piece) as "boxPiece"
+        ,tmgs.price_purchase
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
+        left join dkic_b.t_mst_customer as tms on tpo.cus_id = tms.cus_id
         LEFT join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
         left join dkic_b.t_mst_unit ul on t.unit_id = ul.unit_id
         left join dkic_b.t_mst_unit u2 on t.sub_unit_id = u2.unit_id
@@ -708,6 +716,12 @@
             group by from_item_id) as pi on pi.from_item_id = t.item_id
         <where>
             t.item_qty - coalesce(sumQty,0) > 0
+            AND t.sku_id is not null
+            AND t.flg_valid
+            AND tpo.flg_valid
+            <if test="cpId != null">
+                AND t.cp_id = #{cpId}
+            </if>
             <if test="orderNo != null">
                 AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
             </if>
@@ -728,6 +742,12 @@
         group by from_item_id) as pi on pi.from_item_id = t.item_id
         <where>
             t.item_qty - coalesce(sumQty,0) > 0
+            AND t.sku_id is not null
+            AND t.flg_valid
+            AND tpo.flg_valid
+            <if test="cpId != null">
+                AND t.cp_id = #{cpId}
+            </if>
             <if test="orderNo != null">
                 AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
             </if>

src/main/java/com/dk/mdm/model/pojo/ivt/Transfer.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.vo.AnnexVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.AllArgsConstructor;
@@ -239,7 +240,7 @@ public class Transfer extends PageInfo<Transfer> implements Serializable {
     @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONArray annexPaths;
+    private List<AnnexVO> annexPaths;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/pojo/mst/GoodsBrand.java

@@ -1,24 +1,26 @@
 package com.dk.mdm.model.pojo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.*;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.*;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
+import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  商品品牌
@@ -165,7 +167,6 @@ public class GoodsBrand extends PageInfo<GoodsBrand> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
-
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/pur/PurchaseQuery.java

@@ -2,7 +2,6 @@ package com.dk.mdm.model.query.pur;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -381,6 +380,9 @@ public class PurchaseQuery extends PageInfo<PurchaseQuery> implements Serializab
     @ApiModelProperty(value = "商品名称")
     private String skuName;
 
+    @ApiModelProperty(value = "商品型号")
+    private String skuModel;
+
     @ApiModelProperty(value = "取货日期开始")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class,exist = false)

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.JsonTypeHandler;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -22,7 +21,6 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  *  销售明细
@@ -454,6 +452,8 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
 
+    @ApiModelProperty(value = "采购标价")
+    private BigDecimal pricePurchase;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/ivt/TransferVO.java

@@ -8,6 +8,7 @@ import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
+import com.dk.common.model.vo.AnnexVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,7 +52,7 @@ public class TransferVO extends PageInfo<TransferVO> implements Serializable {
     @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)
-    private JSONArray annexPaths;
+    private List<AnnexVO> annexPaths;
 
     /**
      * 调整单号

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

@@ -4,30 +4,22 @@ import com.dk.common.exception.BaseBusinessException;
 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.GoodsBrandConvert;
-import com.dk.mdm.infrastructure.convert.mst.GoodsSkuConvert;
-import com.dk.mdm.model.pojo.mst.GoodsBrand;
 import com.dk.mdm.mapper.mst.GoodsBrandMapper;
-import com.dk.common.service.BaseService;
-import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.mst.GoodsSku;
-import com.dk.mdm.model.pojo.mst.Role;
-import com.dk.mdm.model.query.mst.GoodsSkuQuery;
-import com.dk.mdm.model.query.mst.RoleQuery;
-import com.dk.mdm.model.response.mst.GoodsSkuResponse;
-import com.dk.mdm.model.vo.mst.GoodsSkuVO;
-import com.dk.mdm.model.vo.mst.RoleVo;
-import com.dk.mdm.service.common.CommonService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
+import com.dk.mdm.model.pojo.mst.GoodsBrand;
 import com.dk.mdm.model.query.mst.GoodsBrandQuery;
 import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
+import com.dk.mdm.service.common.CommonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -132,6 +124,13 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_BRAVDNAME.getMessage());
         }
         super.updateByUuid(goodsBrand);
+        //保存供应商
+        List<String> supplierIds = goodsBrandVO.getSupplierIds();
+        if (supplierIds != null) {
+            for (String supplierId : supplierIds) {
+                goodsBrandMapper.saveSupplierBrand(supplierId, goodsBrand.getBrandId());
+            }
+        }
         return ResponseResultUtil.success();
     }