diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java index ea9b3f6..793308e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDetailsVo.java @@ -21,6 +21,7 @@ public class BaseProductDetailsVo implements Vo { @ApiModelProperty("对应商品sid") private String goodsSid; // 产品对应商品sid private String productName; // 产品名称 + private String productCode; // 产品编码 @ApiModelProperty("0产出率/1配比(初加工/深加工)") private String rateType; // 0产出率/1配比(初加工/深加工) private List list = new ArrayList<>(); //原料列表 diff --git a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java index 0941a71..29ffe9e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/baseproduct/BaseProductDto.java @@ -21,6 +21,7 @@ public class BaseProductDto implements Dto { @ApiModelProperty("对应商品sid") private String goodsSid; // 产品对应商品sid private String productName; // 产品名称 + private String productCode; // 产品编码 @ApiModelProperty("0产出率/1配比(初加工/深加工)") private String rateType; // 0产出率/1配比(初加工/深加工) private List list = new ArrayList<>(); //原料列表 diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java index e0094e1..6b5db5b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmvisit/CrmVisitService.java @@ -79,11 +79,19 @@ public class CrmVisitService { visit.setIsOnRemind(isOnRemind); List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.REMIND_DAY, "0").getData(); String remindDayKey = ""; - if (commonVoList.size() > 0) { - remindDayKey = commonVoList.get(0).getDictKey(); + if (commonVoList != null) { + 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 sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid); String name = sysUserVoResultBean.getData().getName(); - ResultBean > resultBean = crmVisitFeign.pageList(pagerQuery); + ResultBean> resultBean = crmVisitFeign.pageList(pagerQuery); if (resultBean.getSuccess()) { PagerVo data = resultBean.getData(); List 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) { diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java index c0225b6..441f7eb 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/ProductGoodsQuery.java @@ -11,6 +11,6 @@ import lombok.Data; public class ProductGoodsQuery { private String queryName; - private String useOrgSid; + private String createOrgSid; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index dd794a9..5e66f04 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -34,17 +34,19 @@ 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.sales.smssalesbill.*; import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; +import com.yxt.oms.feign.warehouse.warehouseoutbill.WarehouseOutBillDetailDto; +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.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -70,6 +72,8 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -197,8 +201,127 @@ public class SmsSalesBillService extends MybatisBaseService sids = billDto.getSids(); + for (String sid : sids) { + SmsSalesBillDetailsVo vo = fetchDetailsVoBySid(sid).getData(); + WarehouseOutBillDto dto = new WarehouseOutBillDto(); + dto.setUserSid(vo.getCreateBySid()); + dto.setUserName(vo.getCreateByName()); + dto.setSourceBillNo(vo.getBillNo()); + dto.setUseOrgSid(vo.getUseOrgSid()); + dto.setCreateOrgSid(vo.getCreateOrgSid()); + if (StringUtils.isNotBlank(vo.getShipperMob())) { + dto.setMobile(vo.getShipperMob()); + } + try { + dto.setOrderTime(sdf.parse(vo.getCreateTime())); + } catch (ParseException e) { + e.printStackTrace(); + } + dto.setOrderNumber(vo.getBillNo()); + SmsSalesBillshipper shipper = smsSalesBillFeign.getShipperByBillSid(sid); + if (null != shipper) { + if (StringUtils.isNotBlank(shipper.getBuyerMessage())) { + dto.setBuyerMessage(shipper.getBuyerMessage()); + } + if (StringUtils.isNotBlank(shipper.getShipperName())) { + dto.setShipper(shipper.getShipperName()); + dto.setConsignee(shipper.getShipperName()); + } + if (StringUtils.isNotBlank(shipper.getPhone())) { + dto.setFixedLine(shipper.getPhone()); + } + if (StringUtils.isNotBlank(shipper.getPostCode())) { + dto.setPostalCode(shipper.getPostCode()); + } + if (StringUtils.isNotBlank(shipper.getDeliveryProvince())) { + dto.setProvince(shipper.getDeliveryProvince()); + } + if (StringUtils.isNotBlank(shipper.getDeliveryCity())) { + dto.setCity(shipper.getDeliveryCity()); + } + if (StringUtils.isNotBlank(shipper.getDeliveryCounty())) { + dto.setCounty(shipper.getDeliveryCounty()); + } + if (StringUtils.isNotBlank(shipper.getDeliveryAddress())) { + dto.setAddress(shipper.getDeliveryAddress()); + } + } + SmsSalesBillLogistics logistics = smsSalesBillFeign.getLogisticsByBillSid(sid); + if (null != logistics) { + if (StringUtils.isNotBlank(logistics.getLogisticsName())) { + dto.setCarrierValue(logistics.getLogisticsName()); + } + if (StringUtils.isNotBlank(logistics.getLogisticsNameSid())) { + dto.setCarrierKey(logistics.getLogisticsNameSid()); + } + if (StringUtils.isNotBlank(logistics.getDeliveryTypeValue())) { + dto.setDeliveryMethod(logistics.getDeliveryTypeValue()); + } + if (null != logistics.getWeight()) { + dto.setWeight(logistics.getWeight().doubleValue()); + } + if (null != logistics.getVolume()) { + dto.setVolume(logistics.getVolume().doubleValue()); + } + if (null != logistics.getDeliveryDate()) { + dto.setDeliveryTime(logistics.getDeliveryDate()); + } + if (null != logistics.getLatestArriveTime()) { + dto.setLatestDeliveryTime(logistics.getLatestArriveTime()); + } + } + SmsSalesBillShop shop = smsSalesBillFeign.getShopByBillSid(sid); + if (null != shop) { + if (StringUtils.isNotBlank(shop.getBuyserNickname())) { + dto.setBuyer(shop.getBuyserNickname()); + } + } + SmsSalesBillAmount amount = smsSalesBillFeign.getAmountByBillSid(sid); + if (null != amount) { + if (null != amount.getRealPay()) { + dto.setActualPayment(amount.getRealPay().doubleValue()); + } + if (null != amount.getDiscountAmount()) { + dto.setDiscount(amount.getDiscountAmount().doubleValue()); + } + if (null != amount.getFreight()) { + dto.setFreight(amount.getFreight().doubleValue()); + } + } + List detailsList = new ArrayList<>(); + List goods = smsSalesBillFeign.getGoodsDetailByBillSid(sid); + if (null != goods) { + if (goods.size() > 0 && !goods.isEmpty()) { + for (SmsSalesBillDetail g : goods) { + WarehouseOutBillDetailDto d = new WarehouseOutBillDetailDto(); + BeanUtil.copyProperties(g,d,"id","sid"); + if (null != g.getCount()) { + d.setOrderCount(g.getCount()); + } + if (null != g.getDueAmount()) { + d.setReceivable(g.getDueAmount()); + } + if (null != g.getAmount()) { + d.setActualPrice(g.getAmount()); + d.setSalesAmount(g.getAmount()); + } + detailsList.add(d); + } + dto.setDetailsList(detailsList); + } + } + warehouseOutBillFeign.saveOrUpdateOutBill(dto); + } + } + return rb.success(); } public ResultBean submit(SmsSalesBillDto dto) { diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillAmount.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillAmount.java new file mode 100644 index 0000000..7b228a7 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillAmount.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillAmount.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbillamount.SmsSalesBillAmount
+ * Description: 销售订单-费用.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-费用", description = "销售订单-费用") +@TableName("sms_sales_bill_amount") +public class SmsSalesBillAmount extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("折扣率") + private BigDecimal discountRate; // 折扣率 + @ApiModelProperty("整体优惠券") + private BigDecimal coupon; // 整体优惠券 + @ApiModelProperty("整体优惠金额") + private BigDecimal discountAmount; // 整体优惠金额 + @ApiModelProperty("优惠后金额") + private BigDecimal amount; // 优惠后金额 + @ApiModelProperty("应收合计") + private BigDecimal dueAmount; // 应收合计 + @ApiModelProperty("运费") + private BigDecimal freight; // 运费 + @ApiModelProperty("是否货到付款(1是,0否)") + private Integer isFirstPay; // 是否货到付款(1是,0否) + @ApiModelProperty("本次收款") + private BigDecimal thisPay; // 本次收款 + @ApiModelProperty("本次欠款") + private BigDecimal thisDebt; // 本次欠款 + @ApiModelProperty("总欠款") + private BigDecimal totalDebt; // 总欠款 + @ApiModelProperty("预收款余额") + private BigDecimal advanceBalance; // 预收款余额 + @ApiModelProperty("买家实付") + private BigDecimal realPay; // 买家实付 + @ApiModelProperty("服务费") + private BigDecimal serviceAmount; // 服务费 + @ApiModelProperty("声明价值(保值)") + private BigDecimal declaredValue; // 声明价值(保值) +} diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillDetail.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillDetail.java new file mode 100644 index 0000000..a00ae88 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillDetail.java @@ -0,0 +1,119 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillDetail.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbilldetail.SmsSalesBillDetail
+ * Description: 销售订单-商品清单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-商品清单", description = "销售订单-商品清单") +@TableName("sms_sales_bill_detail") +public class SmsSalesBillDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("工单sid") + private String billSid; // 工单sid + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("重量(kg)") + private BigDecimal weight; // 重量(kg) + @ApiModelProperty("体积(立方米)") + private BigDecimal volume; // 体积(立方米) + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("辅单位数量") + private String auxiliaryUnit; // 辅单位数量 + @ApiModelProperty("销售单价") + private BigDecimal price; // 销售单价 + @ApiModelProperty("数量") + private BigDecimal count; // 数量 + @ApiModelProperty("折扣率") + private BigDecimal discountRtate; // 折扣率 + @ApiModelProperty("折后单价") + private BigDecimal discountPrice; // 折后单价 + @ApiModelProperty("应收款") + private BigDecimal dueAmount; // 应收款 + @ApiModelProperty("商品成本") + private BigDecimal cost; // 商品成本 + @ApiModelProperty("分摊优惠") + private BigDecimal discountAmount; // 分摊优惠 + @ApiModelProperty("惠后金额") + private BigDecimal amount; // 惠后金额 + @ApiModelProperty("库存数量") + private BigDecimal inventoryCount; // 库存数量 + @ApiModelProperty("条码") + private String barCode; // 条码 + @ApiModelProperty("图片") + private String goodsImgUrl; // 图片 + @ApiModelProperty("参考进价") + private BigDecimal referenceCost; // 参考进价 + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("库存状况(0未分配/1已分配)") + private Integer inventoryState; // 库存状况(0未分配/1已分配) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计发货时间") + private Date expectSendDate; // 预计发货时间 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; // 未含税价 + @ApiModelProperty("总税额(未含税总额)") + private BigDecimal taxTotalAmount; // 总税额(未含税总额) + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java index 40e070c..391b120 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @description: * @author: fzz @@ -64,4 +66,28 @@ public interface SmsSalesBillFeign { @ApiOperation("提交") @PostMapping("/submit") public ResultBean submit(@RequestBody SmsSalesBillDto dto); + + @ApiOperation("获取收货人信息") + @GetMapping("/getShipperByBillSid") + public SmsSalesBillshipper getShipperByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("获取店铺信息") + @GetMapping("/getShopByBillSid") + public SmsSalesBillShop getShopByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("获取发票信息") + @GetMapping("/getInvoiceByBillSid") + public SmsSalesBillInvoice getInvoiceByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("获取物流信息") + @GetMapping("/getLogisticsByBillSid") + public SmsSalesBillLogistics getLogisticsByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("获取商品信息") + @GetMapping("/getGoodsDetailByBillSid") + public List getGoodsDetailByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("获取费用信息") + @GetMapping("/getAmountByBillSid") + public SmsSalesBillAmount getAmountByBillSid(@RequestParam("sid") String sid); } diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java index ab55eee..e81944d 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java @@ -6,6 +6,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.smssalesbill.*; import org.springframework.stereotype.Component; +import java.util.List; + /** * @description: * @author: fzz @@ -68,4 +70,34 @@ public class SmsSalesBillFeignFallback implements SmsSalesBillFeign { public ResultBean submit(SmsSalesBillDto dto) { return null; } + + @Override + public SmsSalesBillshipper getShipperByBillSid(String sid) { + return null; + } + + @Override + public SmsSalesBillShop getShopByBillSid(String sid) { + return null; + } + + @Override + public SmsSalesBillInvoice getInvoiceByBillSid(String sid) { + return null; + } + + @Override + public SmsSalesBillLogistics getLogisticsByBillSid(String sid) { + return null; + } + + @Override + public List getGoodsDetailByBillSid(String sid) { + return null; + } + + @Override + public SmsSalesBillAmount getAmountByBillSid(String sid) { + return null; + } } diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillInvoice.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillInvoice.java new file mode 100644 index 0000000..52bcdf6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillInvoice.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillInvoice.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbillinvoice.SmsSalesBillInvoice
+ * Description: 销售订单-发票.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-发票", description = "销售订单-发票") +@TableName("sms_sales_bill_invoice") +public class SmsSalesBillInvoice extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("销售单sid") + private String billSid; // 销售单sid + @ApiModelProperty("是否需要开发票(是1,否0)") + private Integer isInvoicing; // 是否需要开发票(是1,否0) + @ApiModelProperty("发票类型Key") + private String invoiceTypeKey; // 发票类型Key + @ApiModelProperty("发票类型") + private String invoiceType; // 发票类型 + @ApiModelProperty("开票名称") + private String invoiceTitle; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + @ApiModelProperty("开票形式(001纸质发票/002电子发票") + private String invoiceMediumKey; // 开票形式(001纸质发票/002电子发票 + @ApiModelProperty("开票形式(纸质发票/电子发票)") + private String invoiceMediumValue; // 开票形式(纸质发票/电子发票) + @ApiModelProperty("内容") + private String invoiceContent; // 内容 + @ApiModelProperty("开户银行") + private String bankName; // 开户银行 + @ApiModelProperty("银行账户") + private String bankAccount; // 银行账户 + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("邮箱") + private String e_mail; // 邮箱 +} diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillLogistics.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillLogistics.java new file mode 100644 index 0000000..05a8659 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillLogistics.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillLogistics.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbilllogistics.SmsSalesBillLogistics
+ * Description: 销售订单-物流信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-物流信息", description = "销售订单-物流信息") +@TableName("sms_sales_bill_logistics") +public class SmsSalesBillLogistics extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("销售单sid") + private String billSid; // 销售单sid + @ApiModelProperty("物流公司sid") + private String logisticsNameSid; // 物流公司 + @ApiModelProperty("物流公司") + private String logisticsName; // 物流公司 + @ApiModelProperty("物流单号") + private String logisticsNum; // 物流单号 + @ApiModelProperty("配送方式Key") + private String deliveryTypeKey; // 配送方式Key + @ApiModelProperty("配送方式Value") + private String deliveryTypeValue; // 配送方式Value + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计发货时间") + private Date expectSendDate; // 预计发货时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("发货日期") + private Date sendDate; // 发货日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预计送达时间") + private Date deliveryDate; // 预计送达时间 + @ApiModelProperty("快递成本/干线费用") + private BigDecimal logisticsCost; // 快递成本/干线费用 + @ApiModelProperty("重量(Kg)") + private BigDecimal weight; // 重量(Kg) + @ApiModelProperty("体积(m³)") + private BigDecimal volume; // 体积(m³) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("下单时间(距今)") + private Date billCreateTime; // 下单时间(距今) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("付款时间(距今)") + private Date payTime; // 付款时间(距今) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚揽收时间") + private Date latestReceivingTime; // 承诺/最晚揽收时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚发货时间") + private Date latestSendTime; // 承诺/最晚发货时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("承诺/最晚送达时间") + private Date latestArriveTime; // 承诺/最晚送达时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("应推时间") + private Date needPushTime; // 应推时间 +} diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillShop.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillShop.java new file mode 100644 index 0000000..8410ef0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillShop.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sales(销售单)
+ * File: SmsSalesBillShop.java
+ * Class: com.yxt.sales.api.smssalesbillshop.SmsSalesBillShop
+ * Description: 销售订单-店铺信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 14:15:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-店铺信息", description = "销售订单-店铺信息") +@TableName("sms_sales_bill_shop") +public class SmsSalesBillShop extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("代发店铺") + private String agentShop; // 代发店铺 + @ApiModelProperty("达人ID(买家ID)") + private String buyserID; // 达人ID(买家ID) + @ApiModelProperty("达人昵称") + private String buyserNickname; // 达人昵称 + @ApiModelProperty("原始平台") + private String originalPlat; // 原始平台 + @ApiModelProperty("原始单号") + private String originalBillNo; // 原始单号 + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillshipper.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillshipper.java new file mode 100644 index 0000000..aba8a26 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillshipper.java @@ -0,0 +1,86 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.feign.sales.smssalesbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: ss-sales(ss-sales)
+ * File: SmsSalesBillshipper.java
+ * Class: com.yxt.sales.apiadmin.api.smssalesbillshipper.SmsSalesBillshipper
+ * Description: 销售订单-收货人信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-04 15:18:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-收货人信息", description = "销售订单-收货人信息") +@TableName("sms_sales_billshipper") +public class SmsSalesBillshipper extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("销售单sid") + private String billSid; // 销售单sid + @ApiModelProperty("收货人姓名") + private String shipperName; // 收货人姓名 + @ApiModelProperty("收货人手机") + private String shipperMob; // 收货人手机 + @ApiModelProperty("收货省sid") + private String deliveryProvinceSid; // 收货省sid + @ApiModelProperty("收货省") + private String deliveryProvince; // 收货省 + @ApiModelProperty("收货市sid") + private String deliveryCitySid; // 收货市sid + @ApiModelProperty("收货市") + private String deliveryCity; // 收货市 + @ApiModelProperty("收货县区sid") + private String deliveryCountySid; // 收货县区sid + @ApiModelProperty("收货县区") + private String deliveryCounty; // 收货县区 + @ApiModelProperty("收货详细地址") + private String deliveryAddress; // 收货详细地址 + @ApiModelProperty("邮编 ") + private String postCode; // 邮编 + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("买家留言") + private String buyerMessage; // 买家留言 + @ApiModelProperty("真实姓名") + private String name; // 真实姓名 + @ApiModelProperty("身份证号码") + private String idNo; // 身份证号码 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDetailDto.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDetailDto.java new file mode 100644 index 0000000..7c15bc1 --- /dev/null +++ b/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; + + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillDto.java new file mode 100644 index 0000000..d9c53a8 --- /dev/null +++ b/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 detailsList = new ArrayList<>(); + + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseoutbill/WarehouseOutBillFeign.java new file mode 100644 index 0000000..7b1e863 --- /dev/null +++ b/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(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @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); + +}