Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempDto.java

@@ -146,4 +146,5 @@ public class CrmCustomerTempDto implements Dto {
     private String customerOrgSid;
     private String customerOrgName;
 
+
 }

oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempQuery.java

@@ -49,8 +49,7 @@ public class CrmCustomerTempQuery implements Query {
     @ApiModelProperty("业务员sid")
     private String staffSid;
 
-    @ApiModelProperty("用户sid")
+
-    private String userSid;
 
     @ApiModelProperty("客户sid")
     private List<String> customerSidList;
@@ -65,4 +64,13 @@ public class CrmCustomerTempQuery implements Query {
     private String staffName;
 
     private String useOrgSid;
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
 }

oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java

@@ -7,6 +7,8 @@ import com.yxt.common.base.utils.HttpStatusEnum;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.commonmethod.CommonMethod;
+import com.yxt.oms.biz.func.commonmethod.DataRule;
 import com.yxt.oms.biz.func.crmfile.CommonAppendixSelectQuery;
 import com.yxt.oms.biz.func.crmfile.CommonAppendixVo;
 import com.yxt.oms.biz.func.crmfile.CommonAttachTypeEnum;
@@ -68,12 +70,14 @@ public class CrmCustomerTempService {
     private DictCommonFeign dictCommonFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
-
+    @Autowired
+    private CommonMethod commonMethod;
     public ResultBean<PagerVo<CrmCustomerTempVo>> listPageVo(PagerQuery<CrmCustomerTempQuery> pq) {
-        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
-            String staffSid = sysUserFeign.selectBySid(pq.getParams().getUserSid()).getData().getStaffSid();
+        CrmCustomerTempQuery query = pq.getParams();
-            pq.getParams().setStaffSid(staffSid);
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
-        }
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
         return crmCustomerTempFeign.listPage(pq);
     }
 
@@ -159,13 +163,13 @@ public class CrmCustomerTempService {
         dto.fillEntity(crmCustomerTemp);
         crmCustomerTemp.setCreateBySid(dto.getUserSid());
         crmCustomerTemp.setStaffSid(sysUserInfoVo.getStaffSid());
-        String orgSid = "";
+//        String orgSid = "";
-        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+//        if (StringUtils.isNotBlank(dto.getOrgPath())) {
-            orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+//            orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
-        } else {
+//        } else {
-            orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+//            orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        }
+//        }
-        crmCustomerTemp.setCreateOrgSid(orgSid);
+        crmCustomerTemp.setCreateOrgSid(dto.getCreateOrgSid());
         ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
         if (resultBean.getSuccess() && resultBean.getData() != null) {
             String key = resultBean.getData().toString();

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java

@@ -36,6 +36,10 @@ public class GoodsSkuPurSelectList {
     private BigDecimal cost;
     //单价1
     private BigDecimal cost1;
+    //保质期
+    private String shelfLife;
+    //税率
+    private BigDecimal taxRate;
     //货号
     private String itemNumber;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectQuery.java

@@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query {
     private String goodsSkuCode;
     //商品名称
     private String goodsName;
-    //商品条码
-    private String barCode;
-    //规格名称
-    private String goodsSkuOwnSpec;
 
-    private String orgPath;
+    private String createOrgSid;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java

@@ -68,4 +68,9 @@ public class PurchaseBillExVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("最后修改时间")
     private Date modifyTime;
+
+    @ApiModelProperty("收货状态value")
+    private String receiveStateValue;
+    @ApiModelProperty("发货状态value")
+    private String deliveryStateValue;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java

@@ -49,7 +49,7 @@ public class PurchaseBillQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("采购员")
-    private String purchaserSid;
+    private String purchaserName;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("发货状态key")
@@ -65,4 +65,7 @@ public class PurchaseBillQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
     private int index;
+
+    @ApiModelProperty("审核状态key")
+    private String examineStateKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@@ -99,6 +99,8 @@ public class PurchaseBillDetailDetailsVo implements Vo {
     private Date deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java

@@ -94,6 +94,8 @@ public class PurchaseBillDetailDto implements Dto {
     private String deliveryDate;
     @ApiModelProperty("总税额")
     private BigDecimal taxAmount;
+    @ApiModelProperty("保质期")
+    private Integer shelfLife;
 
     /*
      * 商品扩展字段

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/GoodsCountVo.java

@@ -0,0 +1,20 @@
+package com.yxt.oms.biz.func.smssalesbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/8/6 14:44
+ */
+@Data
+public class GoodsCountVo {
+
+    @ApiModelProperty("实际库存")
+    private String inventoryCount; // 库存数量
+    @ApiModelProperty("可分配库存")
+    private String allocateCount; // 可分配库存
+    @ApiModelProperty("可用库存")
+    private String useCount; // 可用库存
+}

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java

@@ -19,6 +19,8 @@ public class ReviewGoods {
     private String goodsSpuName; // 商品名称
     @ApiModelProperty("商品Sku名称")
     private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("goodsSkuSid")
+    private String goodsSkuSid; // goodsSkuSid
     @ApiModelProperty("商品编码")
     private String goodsSkuCode; // 商品编码
     @ApiModelProperty("规格型号")

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java

@@ -133,7 +133,7 @@ public class SmsSalesBillDetailsVo implements Vo {
     private String taxRate; // 税率
     //商品信息
     @ApiModelProperty("商品列表")
-    private List<SmsSalesBillDetailDetailsVo> goodsList; // 商品列表
+    private List<SmsSalesBillDetailDetailsVo> goodsList = new ArrayList<>(); // 商品列表
 
     //费用信息
     @ApiModelProperty("折扣率")
@@ -158,7 +158,7 @@ public class SmsSalesBillDetailsVo implements Vo {
     private String advanceBalance; // 预收款余额
     //结算
     @ApiModelProperty("结算账户")
-    private List<AccountVo> accounts;
+    private List<AccountVo> accounts = new ArrayList<>();
     @ApiModelProperty("付款凭证")
     private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
     @ApiModelProperty("结算账户")

oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java

@@ -34,10 +34,12 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign;
+import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -61,7 +63,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
 
     @Resource
     private SmsSalesBillFeign smsSalesBillFeign;
-
+    @Resource
+    private WarehouseInventoryFeign warehouseInventoryFeign;
     private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -115,7 +118,21 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     }
 
     public ResultBean<ReviewDetailsVo> reviewDetails(String sid) {
-        return smsSalesBillFeign.reviewDetails(sid);
+       ResultBean rb = ResultBean.fireFail();
+        ReviewDetailsVo data = smsSalesBillFeign.reviewDetails(sid).getData();
+        List<ReviewGoods> goods = data.getGoods();
+        if (!goods.isEmpty()) {
+            for (ReviewGoods good : goods) {
+                String goodsSkuSid = good.getGoodsSkuSid();
+                GoodsCountVo goodsCountVo = warehouseInventoryFeign.selCountsBySkuSid(goodsSkuSid);
+                if (null != goodsCountVo) {
+                    good.setAllocateCount(goodsCountVo.getAllocateCount());
+                    good.setUseCount(goodsCountVo.getUseCount());
+                    good.setInventoryCount(goodsCountVo.getInventoryCount());
+                }
+            }
+        }
+        return rb.success().setData(data);
     }
 
     public ResultBean saveShipper(ReviewDetailsVo dto) {

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java

@@ -1,6 +1,7 @@
 package com.yxt.oms.feign.warehouse.warehouseInventory;
 
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.smssalesbill.GoodsCountVo;
 import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,4 +34,8 @@ public interface WarehouseInventoryFeign {
     @ApiOperation("根据skuSid查询商品库存")
     @PostMapping("/selInventoryCountBySkuSid")
     public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid);
+
+    @ApiOperation("根据skuSid查询商品库存")
+    @PostMapping("/selCountsBySkuSid")
+    public GoodsCountVo selCountsBySkuSid(@RequestParam("skuSid") String skuSid);
 }