细节修改

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDEditDTO.java

@@ -22,13 +22,13 @@ public class ErpCgDDEditDTO {
      * 采购计划编号
      */
     @Schema(description="采购计划编号")
-    private String planCode;
+    private String code;
 
     /**
      * 采购计划单据日期
      */
     @Schema(description="采购计划单据日期")
-    private LocalDate planDate;
+    private LocalDate ddDate;
 
     /**
      * 仓库id

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/cgdd/ErpCgDDSaveDTO.java

@@ -19,14 +19,14 @@ public class ErpCgDDSaveDTO {
     /**
      * 采购计划编号
      */
-    @Schema(description="采购计划编号")
-    private String planCode;
+    @Schema(description="编号")
+    private String code;
 
     /**
      * 采购计划单据日期
      */
-    @Schema(description="采购计划单据日期")
-    private LocalDate planDate;
+    @Schema(description="单据日期")
+    private LocalDate ddDate;
 
     /**
      * 仓库id

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgDdEntity.java

@@ -40,7 +40,7 @@ public class SmErpCgDdEntity extends Model<SmErpCgDdEntity> {
 	* 单据日期
 	*/
     @Schema(description="单据日期")
-    private LocalDate dDate;
+    private LocalDate ddDate;
 
 	/**
 	* 经办人id
@@ -156,6 +156,8 @@ public class SmErpCgDdEntity extends Model<SmErpCgDdEntity> {
     @Schema(description="租户编号")
     private Long tenantId;
 
+	@Schema(description="关联状态")
+	private String linkStatus;
 
 	@Schema(description="关联编码")
 	private String linkCode;

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCgPlanEntity.java

@@ -133,6 +133,9 @@ public class SmErpCgPlanEntity extends Model<SmErpCgPlanEntity> {
     @Schema(description="租户编号")
     private Long tenantId;
 
+	@Schema(description="关联状态")
+	private String linkStatus;
+
 	@TableField(exist = false)
 	@Schema(description="商品名称")
 	private String productName;

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java

@@ -216,7 +216,7 @@ public class SmErpInventoryRecordsController {
 
         LambdaQueryWrapper<SmErpCgDdEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.like(StrUtil.isNotBlank(cgDdLinkQueryDTO.getCode()),SmErpCgDdEntity::getCode,cgDdLinkQueryDTO.getCode());
-        wrapper.eq(Objects.nonNull(cgDdLinkQueryDTO.getDDate()),SmErpCgDdEntity::getDDate,cgDdLinkQueryDTO.getDDate());
+        wrapper.eq(Objects.nonNull(cgDdLinkQueryDTO.getDDate()),SmErpCgDdEntity::getDdDate,cgDdLinkQueryDTO.getDDate());
 
         //todo 审核成功条件
 //        wrapper.eq(SmErpCgPlanEntity::getCheckStatus,);

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java

@@ -19,6 +19,7 @@ import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanEntity;
 import com.bsd.pjcloud.supermarket.entity.SmErpCgPlanItemEntity;
 import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdItemMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdMapper;
+import com.bsd.pjcloud.supermarket.mapper.SmErpCgPlanMapper;
 import com.bsd.pjcloud.supermarket.service.SmErpCgDdService;
 import com.bsd.pjcloud.supermarket.vo.cgdd.SmErpCgDdVo;
 import com.bsd.pjcloud.supermarket.vo.cgdd.SmeErpCgDdItemVo;
@@ -26,6 +27,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanItemVo;
 import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.List;
@@ -45,7 +47,10 @@ public class SmErpCgDdServiceImpl extends ServiceImpl<SmErpCgDdMapper, SmErpCgDd
 
     private final SmErpCgDdItemMapper smErpCgDDItemMapper;
 
+    private final SmErpCgPlanMapper smErpCgPlanMapper;
+
     @Override
+    @Transactional
     public Object saveCGDD(ErpCgDDSaveDTO erpCgDDSaveDTO) {
         Long deptId = SecurityUtils.getUser().getDeptId();
         SmErpCgDdEntity smErpCgDdEntity = BeanUtils.toBean(erpCgDDSaveDTO, SmErpCgDdEntity.class);
@@ -61,6 +66,13 @@ public class SmErpCgDdServiceImpl extends ServiceImpl<SmErpCgDdMapper, SmErpCgDd
             cgPlanItemEntity.setDeptId(deptId);
         }
         smErpCgDDItemMapper.insert(cgPlanItemEntities);
+        //更新已关联的采购计划，标记为已使用
+        LambdaQueryWrapper<SmErpCgPlanEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmErpCgPlanEntity::getPlanCode, erpCgDDSaveDTO.getCode());
+        SmErpCgPlanEntity smErpCgPlanEntity = new SmErpCgPlanEntity();
+        smErpCgPlanEntity.setLinkStatus("1");
+        smErpCgPlanMapper.update(smErpCgPlanEntity,queryWrapper);
+
         return insert;
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.supermarket.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
@@ -7,10 +8,8 @@ import com.bsd.pjcloud.supermarket.dto.cgdd.SmCgDDSaveItemDTO;
 import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveDTO;
 import com.bsd.pjcloud.supermarket.dto.inventoryrecords.InventoryRecordSaveItemDTO;
 import com.bsd.pjcloud.supermarket.dto.inventoryrecords.UpdateStockDTO;
-import com.bsd.pjcloud.supermarket.entity.SmErpCgDdEntity;
-import com.bsd.pjcloud.supermarket.entity.SmErpCgDdItemEntity;
-import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsEntity;
-import com.bsd.pjcloud.supermarket.entity.SmErpInventoryRecordsItemEntity;
+import com.bsd.pjcloud.supermarket.entity.*;
+import com.bsd.pjcloud.supermarket.mapper.SmErpCgDdMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpInventoryRecordsItemMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpInventoryRecordsMapper;
 import com.bsd.pjcloud.supermarket.mapper.SmErpStockMapper;
@@ -36,6 +35,8 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
     private final SmErpInventoryRecordsItemMapper smErpInventoryRecordsItemMapper;
 
     private final SmErpStockService smErpStockService;
+
+    private final SmErpCgDdMapper smErpCgDdMapper;
     @Override
     @Transactional
     public Object saveInventoryRecord(InventoryRecordSaveDTO inventoryRecordSaveDTO) {
@@ -65,6 +66,12 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
         //更新库存
         smErpStockService.updateStock(updateStockDTOS);
 
+        //更新已关联的采购，标记为已使用
+        LambdaQueryWrapper<SmErpCgDdEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SmErpCgDdEntity::getCode, inventoryRecordSaveDTO.getInventoryCode());
+        SmErpCgDdEntity updateSmErpCgDdEntity = new SmErpCgDdEntity();
+        updateSmErpCgDdEntity.setLinkStatus("1");
+        smErpCgDdMapper.update(updateSmErpCgDdEntity,queryWrapper);
         return insert;
     }
 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgDdMapper.xml

@@ -6,7 +6,7 @@
   <resultMap id="smErpCgDdMap" type="com.bsd.pjcloud.supermarket.entity.SmErpCgDdEntity">
         <id property="id" column="id"/>
         <result property="code" column="code"/>
-        <result property="dDate" column="d_date"/>
+        <result property="ddDate" column="dd_date"/>
         <result property="handlerUserId" column="handler_user_id"/>
         <result property="checkStatus" column="check_status"/>
         <result property="checkUserId" column="check_user_id"/>
@@ -26,5 +26,6 @@
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="linkCode" column="link_code"/>
+        <result property="linkStatus" column="link_status"/>
   </resultMap>
 </mapper>

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCgPlanMapper.xml

@@ -21,5 +21,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="linkStatus" column="link_status"/>
   </resultMap>
 </mapper>