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

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1540,7 +1540,10 @@
              tmc.cus_id AS "cusId",
              tmc.cus_code AS "cusCode",
              tmc.cus_name AS "cusName",
-             tmc.cus_phone AS "cusPhone"
+             tmc.cus_phone AS "cusPhone",
+        tmgs.sku_spec as "skuSpec",
+        concat ( sys.f_remove_zero ( T.item_qty ), tmgu.unit_name ) AS "itemQtyPiece",
+        dkic_b.f_box_piece ( tmgus.unit_name, tmgu.unit_name, T.BOX, T.piece ) AS "boxPiece"
         FROM dkic_b.t_psi_order_item as t
         inner join dkic_b.t_psi_order tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
@@ -1548,8 +1551,10 @@
         left join dkic_b.t_mst_customer tmc on tmc.cus_id = tpo.cus_id
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
         left join sys.t_data_kind as tdk3 on tpo.out_status = tdk3.kind_code
+        LEFT JOIN dkic_b.t_mst_unit AS tmgu ON tmgs.unit_id = tmgu.unit_id
+        LEFT JOIN dkic_b.t_mst_unit AS tmgus ON tmgs.sub_unit_id = tmgus.unit_id
         <include refid="ConditionSaleItem"/>
-        order by t.item_index
+        order by tpo.make_time,t.item_index
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -1617,12 +1622,45 @@
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
+            <if test="makeTimeStart != null and makeTimeEnd != null">
+                AND tpo.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpo.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+            </if>
+            <if test="skuName != null and skuName != ''">
+                AND tmgs.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
+            </if>
+            <if test="skuModel != null and skuModel != ''">
+                AND tmgs.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
+            </if>
+            <if test="brandName != null and brandName != ''">
+                AND tmgb.brand_name like concat('%', my_ex.likequery(#{brandName}) , '%')
+            </if>
+            <if test="whName != null and whName != ''">
+                AND tmw.wh_name like concat('%', my_ex.likequery(#{whName}) , '%')
+            </if>
+            <if test="nonStdCode != null and nonStdCode != ''">
+                AND t.non_std_code like concat('%', my_ex.likequery(#{nonStdCode}) , '%')
+            </if>
+            <if test="searchText !=null and searchText != ''">
+                AND (
+                tpo.order_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                )
+            </if>
+            <if test="isFlgGift != null and isFlgGift == true">
+                AND t.flg_gift
+            </if>
+            <if test="isExtCo != null and isExtCo == true">
+                AND t.sku_id  is null
+            </if>
         </where>
     </sql>
     <select id="getSalesItemReportCount" resultType="java.lang.Long">
         SELECT count(1)
         FROM
          dkic_b.t_psi_order_item t
+        inner join dkic_b.t_psi_order tpo on tpo.order_id = t.order_id
         <include refid="ConditionSaleItem"/>
     </select>
 
@@ -3014,7 +3052,7 @@
             OR tmc.address_full LIKE concat('%',#{searchText},'%'))
         </if>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
-            LIMIT #{pageSize} OFFSET #{currentPage}
+            limit #{end} offset #{start}
         </if>
     </select>
 

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

@@ -39,7 +39,7 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
      * 错误信息
      */
     @Excel(name = "错误提示")
-    @ApiModelProperty(value = "错误提示")
+    @TableField(exist = false)
     private String errorMessage;
 
     /*
@@ -101,39 +101,35 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
      * 品牌名称
      */
     @Excel(name = "商品品牌")
-    @ApiModelProperty(value = "商品品牌")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String brandName;
 
     /**
      * 商品种类
      */
     @Excel(name = "商品种类")
-    @ApiModelProperty(value = "商品种类")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String categoryName;
 
     /**
      * 计量单位
      */
     @Excel(name = "计量单位")
-    @ApiModelProperty(value = "计量单位")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String unitName;
 
     /**
      * 辅助单位
      */
     @Excel(name = "辅助单位")
-    @ApiModelProperty(value = "辅助单位")
-    @TableField(typeHandler = UuidTypeHandler.class)
+    @TableField(exist = false)
     private String subUnitName;
 
     /**
      * 商品系列
      */
     @Excel(name = "商品系列")
-    @ApiModelProperty(value = "商品系列")
+    @TableField(exist = false)
     private String seriesName;
 
     /**

src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -341,10 +341,10 @@ public class Order extends PageInfo<Order> implements Serializable {
     private Integer cpId;
 
     /**
-     * 实际金额
+     * 实收金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "实收金额")
+    @ApiModelProperty(value = "实收金额")
     private BigDecimal factAmt;
 
     /**

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -248,17 +248,17 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     private Integer decimalPlaces;
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @Excel(name = "实际单价")
-    @ApiModelProperty(value = "实际单价")
+    @Excel(name = "优惠后单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "优惠后金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

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

@@ -384,17 +384,17 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @Excel(name = "实际单价")
-    @ApiModelProperty(value = "实际单价")
+    @Excel(name = "优惠后单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "优惠后金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

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

@@ -349,10 +349,10 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     private Boolean flgValid;
 
     /**
-     * 实际金额
+     * 实收金额
      */
-    @Excel(name = "实际金额")
-    @ApiModelProperty(value = "实际金额")
+    @Excel(name = "实收金额")
+    @ApiModelProperty(value = "实收金额")
     private BigDecimal factAmt;
 
     /**

src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -255,15 +255,15 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
 
 
     /**
-     * 实际单价
+     * 优惠后单价
      */
-    @ApiModelProperty(value = "实际单价")
+    @ApiModelProperty(value = "优惠后单价")
     private BigDecimal factPrice;
 
     /**
-     * 实际金额
+     * 优惠后金额
      */
-    @ApiModelProperty(value = "实际金额")
+    @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
     /**

src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -383,7 +383,7 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     @ApiModelProperty(value = "自动办理参数")
     private Boolean flgHandleSetting;
 
-    @ApiModelProperty(value = "实际金额")
+    @ApiModelProperty(value = "实收金额")
     private BigDecimal factAmt;
 
     @ApiModelProperty(value = "优惠金额")

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

@@ -187,56 +187,75 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 			goodsSku.setCpId(cpId);
 			goodsSku.setErrorMessage("");
 			//TODO 校验规则
+			//商品编号不能为空
+			if(goodsSku.getSkuCode()==null){
+				goodsSku.setErrorMessage("商品编号不能为空,");
+				importMessage = true;
+			}
+			//商品型号不能为空
+			if(goodsSku.getSkuModel()==null){
+				goodsSku.setErrorMessage("商品型号不能为空,");
+				importMessage = true;
+			}
 			//品牌
-			if (goodsSku.getBrandName()!=null ||goodsSku.getBrandName()!= "") {
+			if (goodsSku.getBrandName()!=null) {
 				String brandName = goodsSku.getBrandName();
 				GoodsBrandResponse goodsBrandResponse = goodsBrandMapper.selectByUuId(new GoodsBrandQuery().setBrandName(brandName).setCpId(goodsSku.getCpId()));
 				if(goodsBrandResponse == null){
-					goodsSku.setErrorMessage("1.商品品牌填写错误");
+					goodsSku.setErrorMessage("商品品牌填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setBrandId(goodsBrandResponse.getBrandId());
 				}
+			}else{
+				goodsSku.setErrorMessage("商品品牌不能为空,");
+				importMessage = true;
 			}
 			//种类
-			if (goodsSku.getCategoryName()!=null ||goodsSku.getCategoryName()!= "") {
+			if (goodsSku.getCategoryName()!=null) {
 				String CatagoryName = goodsSku.getCategoryName();
 				GoodsCategoryResponse goodsCategoryResponse = goodsCategoryMapper.selectByUuId(new GoodsCategoryQuery().setCatName(CatagoryName).setCpId(goodsSku.getCpId()));
 				if(goodsCategoryResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "2.商品种类填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品种类填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setCategoryId(goodsCategoryResponse.getCatId());
 				}
+			}else{
+				goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品种类不能为空,");
+				importMessage = true;
 			}
 			//计量单位
-			if (goodsSku.getUnitName()!=null ||goodsSku.getUnitName()!= "") {
+			if (goodsSku.getUnitName()!=null) {
 				String unintName = goodsSku.getUnitName();
 				UnitResponse unitResponse = unitMapper.selectByUuId(new UnitQuery().setUnitName(unintName).setCpId(goodsSku.getCpId()));
 				if(unitResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "3.计量单位填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "计量单位填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setUnitId(unitResponse.getUnitId());
 				}
+			}else{
+				goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "计量单位不能为空,");
+				importMessage = true;
 			}
 			//辅助单位
-			if (goodsSku.getSubUnitName()!=null ||goodsSku.getSubUnitName()!= "") {
+			if (goodsSku.getSubUnitName()!=null) {
 				String subUnintName = goodsSku.getSubUnitName();
 				UnitResponse unitResponse = unitMapper.selectByUuId(new UnitQuery().setUnitName(subUnintName).setCpId(goodsSku.getCpId()));
 				if(unitResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage()  + "4.辅助单位填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage()  + "辅助单位填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setSubUnitId(unitResponse.getUnitId());
 				}
 			}
 			//商品系列
-			if (goodsSku.getSeriesName()!=null ||goodsSku.getSeriesName()!= "") {
+			if (goodsSku.getSeriesName()!=null) {
 				String seriesName = goodsSku.getSeriesName();
 				GoodsSeriesResponse goodsSeriesResponse = goodsSeriesMapper.selectByUuId(new GoodsSeriesQuery().setSeriesName(seriesName).setCpId(goodsSku.getCpId()));
 				if(goodsSeriesResponse == null){
-					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "5.商品系列填写错误");
+					goodsSku.setErrorMessage(goodsSku.getErrorMessage() + "商品系列填写错误,");
 					importMessage = true;
 				}else{
 					goodsSku.setSubUnitId(goodsSeriesResponse.getSeriesId());

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -729,6 +729,8 @@ public class ReportService {
      */
     public ResponseResultVO<List<Map<String, Object>>> getCusRecPayReportItem(Map<String, Object> params) {
         List<Map<String, Object>> items = reportMapper.getCusRecPayReportItemByUser(params);
+        params.put("start", (Integer.parseInt(params.get("currentPage").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()));
+        params.put("end", Integer.parseInt(params.get("pageSize").toString()));
         List<Map<String, Object>> arrears = reportMapper.getUserArrears(params);
         // 判断类型
         for (Map<String, Object> item : items) {