修改客户管理

oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java

@@ -79,11 +79,19 @@ public class CrmVisitService {
         visit.setIsOnRemind(isOnRemind);
         List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.REMIND_DAY, "0").getData();
         String remindDayKey = "";
-        if (commonVoList.size() > 0) {
+        if (commonVoList != null) {
-            remindDayKey = commonVoList.get(0).getDictKey();
+            if (commonVoList.size() > 0) {
+                remindDayKey = commonVoList.get(0).getDictKey();
+            }
         }
         visit.setRemind_day_key(remindDayKey);
-        visit.setRemind_day(dictCommonFeign.selectBykey(remindDayKey, DictCommonType.REMIND_DAY).getData().getDictValue());
+        if (StringUtils.isNotBlank(remindDayKey)) {
+            DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(remindDayKey, DictCommonType.REMIND_DAY).getData();
+            if (null != dictCommonVo) {
+                String dictValue = dictCommonVo.getDictValue();
+                visit.setRemind_day(dictValue);
+            }
+        }
         crmVisitFeign.saveEntity(visit);
         return visit.getSid();
     }
@@ -93,7 +101,7 @@ public class CrmVisitService {
         String staffSid = pagerQuery.getParams().getStaffSid();
         ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid);
         String name = sysUserVoResultBean.getData().getName();
-        ResultBean <PagerVo<CrmVisitVo>> resultBean = crmVisitFeign.pageList(pagerQuery);
+        ResultBean<PagerVo<CrmVisitVo>> resultBean = crmVisitFeign.pageList(pagerQuery);
         if (resultBean.getSuccess()) {
             PagerVo<CrmVisitVo> data = resultBean.getData();
             List<CrmVisitVo> records = data.getRecords();
@@ -122,7 +130,7 @@ public class CrmVisitService {
 
 
     public boolean updateBySid(CrmVisitDto dto, String sid) {
-        return crmVisitFeign.update(dto,sid);
+        return crmVisitFeign.update(dto, sid);
     }
 
     public ResultBean delBySids(String[] ids) {

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

@@ -34,15 +34,14 @@ import com.yxt.common.base.utils.PagerUtil;
 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.purchaseappendix.PurchaseAppendixUrl;
 import com.yxt.oms.feign.sales.smssalesbill.SmsSalesBillFeign;
 import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
+import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillDto;
+import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillFeign;
 import com.yxt.oms.utils.FileQueryUrl;
-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;
@@ -70,6 +69,8 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     private WarehouseInventoryFeign warehouseInventoryFeign;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private WarehouseOutBillFeign warehouseOutBillFeign;
 
     private QueryWrapper<SmsSalesBill> createQueryWrapper(SmsSalesBillQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -198,7 +199,40 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
     }
 
     public ResultBean reviewConfirm(ReviewConfirmDto dto) {
-        return smsSalesBillFeign.reviewConfirm(dto);
+        ResultBean rb = ResultBean.fireFail();
+        smsSalesBillFeign.reviewConfirm(dto);
+        String type = dto.getType();
+        if (type.equals("0")) {
+            //通过推送销售出库
+            List<String> sids = dto.getSids();
+//            for (String sid : sids) {
+//                SmsSalesBillDetailsVo vo = fetchDetailsVoBySid(sid).getData();
+//                WarehouseOutBillDto outBillDto = new WarehouseOutBillDto();
+//                outBillDto.setUserSid(vo.getCreateBySid());
+//                outBillDto.setUserName(vo.getCreateByName());
+//                outBillDto.setSourceBillNo(vo.getBillNo());
+//                ReviewDetailsVo r = reviewDetails(sid).getData();
+//                if (r != null) {
+//                    ReviewRemarksInfo remarksInfo = r.getRemarksInfo();
+//                    if (null != remarksInfo) {
+//                        if (StringUtils.isNotBlank(remarksInfo.getBuyerMessage())) {
+//                            outBillDto.setBuyerMessage(remarksInfo.getBuyerMessage());
+//                        }
+//
+//                    }
+//                    sss
+//
+//                }
+//                if (StringUtils.isNotBlank(vo.getShipperName())) {
+//                    outBillDto.setShipper(vo.getShipperName());
+//                }
+//                if (StringUtils.isNotBlank(vo.getlog))
+//
+//
+//                warehouseOutBillFeign.saveOrUpdateOutBill(outBillDto);
+//            }
+        }
+        return rb.success();
     }
 
     public ResultBean submit(SmsSalesBillDto dto) {

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDetailDto.java

@@ -0,0 +1,59 @@
+package com.yxt.oms.feign.warehouse.warehouseoutbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseOutBillDetailDto {
+    private String sid;
+    @ApiModelProperty("单据sid")
+    private String sourceBillSid;
+    @ApiModelProperty("图片")
+    private String pic;
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("商品sku编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("条码")
+    private String barCode;
+    @ApiModelProperty("计量单位")
+    private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("订单数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("应收价格")
+    private BigDecimal receivable;
+    @ApiModelProperty("实际价格")
+    private BigDecimal actualPrice;
+    @ApiModelProperty("销售金额")
+    private BigDecimal salesAmount;
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+    @ApiModelProperty("库位")
+    private String rackState;
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+    @ApiModelProperty("生产日期")
+    private Date dateOfManufacture;
+    @ApiModelProperty("过期日期")
+    private Date expirationDate;
+    @ApiModelProperty("批次扩展属性")
+    private String batchExpansion;
+
+
+}

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java

@@ -0,0 +1,116 @@
+package com.yxt.oms.feign.warehouse.warehouseoutbill;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseOutBillDto {
+
+    private String sid;
+    @ApiModelProperty("0 待分配 1零拣打单 2待出库 3已出库")
+    private String billState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("来源单号")
+    private String sourceBillNo;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
+    @ApiModelProperty("货主")
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrierKey;
+    private String carrierValue;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    private String remarks;
+    private String userSid;
+    private String userName;
+
+    private List<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
+
+
+}

oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillFeign.java

@@ -0,0 +1,40 @@
+package com.yxt.oms.feign.warehouse.warehouseoutbill;
+
+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.warehouse.wmswarehouserack.WarehouseRackFeignFallback;
+import com.yxt.oms.utils.OrgPathQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "出库单据")
+@FeignClient(
+        contextId = "ss-common-warehouse-WmsOutBill",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/WmsOutBill"
+        )
+public interface WarehouseOutBillFeign {
+
+    @ApiOperation("出库保存修改")
+    @PostMapping("/saveOrUpdateOutBill")
+    ResultBean saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto);
+
+}