diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java new file mode 100644 index 0000000..64d76e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java @@ -0,0 +1,33 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuService; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/4/12 11:20 + */ +@RestController() +@RequestMapping("/apiadmin/basegoodssku") +public class BaseGoodsSkuRest { + + + @Autowired + BaseGoodsSkuService baseGoodsSkuService; + + @ApiOperation("查询组织下所有商品") + @PostMapping("/listAllByOrg") + public ResultBean> listAllByOrg(@RequestBody OrgPathQuery query) { + return baseGoodsSkuService.listAllByOrg(query); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java index 81f80bd..3c35b53 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java @@ -80,8 +80,8 @@ public class PurchaseBillRest { @ApiOperation("采购单提交") @PostMapping("/submit") - public ResultBean submit(@RequestBody PurchaseBillDto dto){ - return purchaseBillService.submit(dto); + public ResultBean submit(@RequestBody String[] sids){ + return purchaseBillService.submit(sids); } @ApiOperation("采购单审核") diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java index 3008d97..17296a9 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java @@ -34,10 +34,9 @@ import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * Project: ss-purchase(采购单)
@@ -60,9 +59,8 @@ public class PurchaseFlowNodeRest { @Autowired private PurchaseFlowNodeService purchaseFlowNodeService; - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - return purchaseFlowNodeService.listPageVo(pq); + public ResultBean> listPage(@RequestParam("sid") String sid){ + return purchaseFlowNodeService.listPageVo(sid); } } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java index 2c9fc9c..f15ac0d 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java @@ -26,7 +26,7 @@ public class SysStaffOrgRest { @GetMapping("/selAllByOrgSidPath") @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") - public ResultBean> selAllByOrgSidPath(String orgSidPath) { + public ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) { return sysStaffOrgService.selAllByOrgSidPath(orgSidPath); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java new file mode 100644 index 0000000..f2a7e67 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java @@ -0,0 +1,24 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsSkuService{ + + @Autowired + BaseGoodsSkuFeign baseGoodsSkuFeign; + + public ResultBean> listAllByOrg(OrgPathQuery query) { + return baseGoodsSkuFeign.listAllByOrg(query); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java new file mode 100644 index 0000000..7fb2c59 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java @@ -0,0 +1,38 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsSkuCode;//商品Sku代码 + private String title;//商品标题 + private String goodsSpuSid;//商品基础信息Sid + private String externalCode;//外部编码 + private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 + @TableField(value = "own_spec") + private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 + private String goodsName; + private BaseGoodsSkuExtendVo baseGoodsSkuExtend; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java new file mode 100644 index 0000000..619b73a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java @@ -0,0 +1,53 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuExtendVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsSkuSid;//商品Skusid + private String finalPurchasePrice;//最后采购价 + private String safetyStockDays;//安全库存天数 + private String isOriginalFactory;//是否原厂 + private String isInventoryAlert;//是否库存警戒 + @TableField(value = "InventoryAlertUpperLimit") + private String inventoryAlertUpperLimit;//库存警戒上线 + @TableField(value = "InventoryAlertLowerLimit") + private String inventoryAlertLowerLimit;//库存警戒下线 + private String costPrice;//成本价 + private String tagPrice;//吊牌价 + private String salesPrice;//销售单价 + private String standardPurchasePrice;//标准进价 + private String agencyPrice;//代理价 + private String discount;//折扣 + private String minimumSalesPrice;//最低零售价 + private String isLockingSalesPrice;//是否锁定销售价 + private String isIntegralExchange;//是否可以积分兑换 + private String integralAmount;//积分数量 + private String sortNo;//排序 + private String picUrl;//商品的图片，多个图片以‘,’分割 +// private String [] Urls={};//图片数组 + private List urls;//图片数组 + private String title;//sku标题 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java new file mode 100644 index 0000000..2e54aa0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java @@ -0,0 +1,12 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/3/22 10:20 + */ +@Data +public class UrlsVo { + private String url; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 8c1bc5b..9d2faa5 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -36,4 +36,6 @@ public class GoodsSkuPurSelectList { private BigDecimal cost; //单价1 private BigDecimal cost1; + //货号 + private String itemNumber; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java index 84c3ea1..7a0e4e6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -46,6 +46,9 @@ public class PurchaseBillDetailsVo implements Vo { private String sid; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人sid") @@ -80,9 +83,8 @@ public class PurchaseBillDetailsVo implements Vo { private String purchaserSid; // 采购员sid（单选） @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") @@ -102,8 +104,6 @@ public class PurchaseBillDetailsVo implements Vo { private PurchaseBillExtendDetailsVo purchaseBillExtend; @ApiModelProperty("采购单商品明细") private List purchaseBillDetailList; - @ApiModelProperty("采购商品扩展") - private List purchaseBillBatchList; @ApiModelProperty("附件") private List purchaseAppendixList; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java index de0c8a0..e4ac57e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java @@ -80,9 +80,8 @@ public class PurchaseBillDto implements Dto { private String purchaserSid; // 采购员sid（单选） @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml index 57c54aa..431fffd 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml @@ -5,7 +5,7 @@