diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java new file mode 100644 index 000000000..539a68dbb --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanEditDTO.java @@ -0,0 +1,86 @@ +package com.bsd.pjcloud.supermarket.dto.cgplan; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; + +/** + * + * 新增一个采购计划 + */ +@Data +@Schema(description = "采购计划保存对象") +public class ErpCgPlanEditDTO { + + + @Schema(description ="id") + private Long id; + /** + * 采购计划编号 + */ + @Schema(description="采购计划编号") + private String planCode; + + /** + * 采购计划单据日期 + */ + @Schema(description="采购计划单据日期") + private LocalDate planDate; + + /** + * 仓库id + */ + @Schema(description="仓库id") + private String warehouseId; + + /** + * 经办人id + */ + @Schema(description="经办人id") + private Long handlerUserId; + + + /** + * 累计进货数量 + */ + @Schema(description="累计进货数量") + private Integer totalNumber; + + /** + * 累计总金额 + */ + @Schema(description="累计总金额") + private Integer totalAmount; + + /** + * 货商 + */ + @Schema(description="货商") + private Long supplierId; + + /** + * 备注 + */ + @Schema(description="备注") + private String remark; + + /** + * 订单编号 + */ + @Schema(description="订单编号") + private String orderNumber; + + + /** + * @Link SmCgPlanEditItemDTO + */ + @Schema(description="采购计划-item") + private List items; + + + + +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java index ae552927d..36d4fd42a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/ErpCgPlanSaveDTO.java @@ -9,6 +9,7 @@ import java.time.LocalDate; import java.util.List; /** + * * 新增一个采购计划 */ @Data @@ -72,8 +73,11 @@ public class ErpCgPlanSaveDTO { private String orderNumber; + /** + * @Link SmCgPlanSaveItemDTO + */ @Schema(description="采购计划-item") - private List items; + private List items; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java new file mode 100644 index 000000000..30aa0ee44 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanEditItemDTO.java @@ -0,0 +1,56 @@ +package com.bsd.pjcloud.supermarket.dto.cgplan; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 采购计划-item + * + * @author zjf + * @date 2025-02-11 17:11:41 + */ +@Data +@Schema(description = "采购计划-item") +public class SmCgPlanEditItemDTO { + + @Schema(description = "id") + private Long id; + + /** + * 库存商品id + */ + @Schema(description="库存商品id") + private Long erpSpuId; + + + /** + * 数量 + */ + @Schema(description="数量") + private Integer quantity; + + /** + * 进价 + */ + @Schema(description="进价") + private Integer unitPrice; + + /** + * 累计总金额 + */ + @Schema(description="累计总金额") + private Integer totalAmount; + + /** + * 备注 + */ + @Schema(description="备注") + private String remark; + + /** + * 包装单位id + */ + @Schema(description="包装单位id") + private Long unitId; + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java index 16f6f3767..6a927095d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgplan/SmCgPlanSaveItemDTO.java @@ -16,7 +16,6 @@ import java.time.LocalDateTime; * @date 2025-02-11 17:11:41 */ @Data -@TableName("sm_erp_cg_plan_item") @Schema(description = "采购计划-item") public class SmCgPlanSaveItemDTO { diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java index c1f0a9371..92ffe7886 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgPlanController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanDTO; +import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO; import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanEntity; import com.bsd.pjcloud.supermarket.service.SmErpCgPlanService; @@ -102,15 +103,15 @@ public class SmErpCgPlanController { /** * 修改采购计划 - * @param smErpCgPlan 采购计划 + * @param erpCgPlanEditDTO 采购计划 * @return R */ @Operation(summary = "修改采购计划" , description = "修改采购计划" ) @SysLog("修改采购计划" ) @PutMapping @PreAuthorize("@pms.hasPermission('supermarket_smErpCgPlan_edit')" ) - public R updateById(@RequestBody SmErpCgPlanEntity smErpCgPlan) { - return R.ok(smErpCgPlanService.updateById(smErpCgPlan)); + public R updateById(@RequestBody ErpCgPlanEditDTO erpCgPlanEditDTO) { + return smErpCgPlanService.updateByErpCgPlanEditDTO(erpCgPlanEditDTO); } /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCgPlanService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCgPlanService.java index b2f082499..f40e61f7d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCgPlanService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCgPlanService.java @@ -1,6 +1,8 @@ package com.bsd.pjcloud.supermarket.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO; import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanEntity; @@ -13,4 +15,11 @@ public interface SmErpCgPlanService extends IService { * @return */ Object saveCgplan(ErpCgPlanSaveDTO erpCgPlanSaveDTO); + + /** + * 修改采购计划 + * @param erpCgPlanEditDTO + * @return + */ + R updateByErpCgPlanEditDTO(ErpCgPlanEditDTO erpCgPlanEditDTO); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java index b60ccd79a..0e0a8ed6f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java @@ -2,9 +2,12 @@ package com.bsd.pjcloud.supermarket.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.common.core.util.BeanUtils; +import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.common.sequence.sequence.Sequence; +import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanEditDTO; import com.bsd.pjcloud.supermarket.dto.cgplan.ErpCgPlanSaveDTO; +import com.bsd.pjcloud.supermarket.dto.cgplan.SmCgPlanSaveItemDTO; import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanEntity; import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanItemEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpCgPlanItemMapper; @@ -39,7 +42,7 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl items = erpCgPlanSaveDTO.getItems(); + List items = erpCgPlanSaveDTO.getItems(); List cgPlanItemEntities = BeanUtils.toBean(items, SmErpCgPlanItemEntity.class); for (SmErpCgPlanItemEntity cgPlanItemEntity : cgPlanItemEntities) { cgPlanItemEntity.setPlanId(smErpCgPlanEntity.getId()); @@ -47,4 +50,19 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl items = erpCgPlanEditDTO.getItems(); + + + return null; + } } \ No newline at end of file