修改入库单添加

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java

@@ -85,7 +85,7 @@ public class WarehouseWarehousingDetailEntity extends TenantEntity {
 	 * 包装数量
 	 */
 	@ApiModelProperty(value = "包装数量")
-	private Integer packagingNumber;
+	private String packagingNumber;
 	/**
 	 * 包装规格
 	 */

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingEntryEntity.java

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -70,6 +71,7 @@ public class WarehouseWarehousingEntryEntity extends TenantEntity {
 	 * 入库时间
 	 */
 	@ApiModelProperty(value = "入库时间")
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
 	private Date receiptDate;
 	/**
 	 * 客户名称
@@ -120,7 +122,7 @@ public class WarehouseWarehousingEntryEntity extends TenantEntity {
 	 * 入库状态
 	 */
 	@ApiModelProperty(value = "入库状态")
-	private String condition;
+	private String conditions;
 	/**
 	 * 入库总件数
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.controller;
 
+import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -116,8 +117,8 @@ public class WarehouseWarehousingEntryController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入warehouseWarehousingEntry")
-	public R submit(@Valid @RequestBody WarehouseWarehousingEntryEntity warehouseWarehousingEntry) {
-		return R.status(warehouseWarehousingEntryService.saveOrUpdate(warehouseWarehousingEntry));
+	public R submit(@Valid @RequestBody WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO) {
+		return R.status(warehouseWarehousingEntryService.saveOrUpdateOwn(warehouseWarehousingEntryDTO));
 	}
 
 	/**

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWarehousingEntryDTO.java

@@ -16,10 +16,13 @@
  */
 package com.logpm.warehouse.dto;
 
+import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 仓库入库单 数据传输对象实体类
  *
@@ -31,4 +34,6 @@ import lombok.EqualsAndHashCode;
 public class WarehouseWarehousingEntryDTO extends WarehouseWarehousingEntryEntity {
 	private static final long serialVersionUID = 1L;
 
+	private List<WarehouseWarehousingDetailEntity> list;
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java

@@ -17,6 +17,7 @@
 package com.logpm.warehouse.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
@@ -49,4 +50,10 @@ public interface IWarehouseWarehousingEntryService extends BaseService<Warehouse
 	 */
 	List<WarehouseWarehousingEntryExcel> exportWarehouseWarehousingEntry(Wrapper<WarehouseWarehousingEntryEntity> queryWrapper);
 
+	/**
+	 * 自定添加修改
+	 * @param warehouseWarehousingEntryDTO
+	 * @return
+	 */
+	Boolean saveOrUpdateOwn(WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -16,11 +16,18 @@
  */
 package com.logpm.warehouse.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.google.common.eventbus.AllowConcurrentEvents;
+import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
+import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
+import com.logpm.warehouse.service.IWarehouseWarehousingDetailService;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
 import com.logpm.warehouse.mapper.WarehouseWarehousingEntryMapper;
 import com.logpm.warehouse.service.IWarehouseWarehousingEntryService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,8 +40,10 @@ import java.util.List;
  * @author BladeX
  * @since 2023-07-10
  */
+@AllArgsConstructor
 @Service
 public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<WarehouseWarehousingEntryMapper, WarehouseWarehousingEntryEntity> implements IWarehouseWarehousingEntryService {
+	private final IWarehouseWarehousingDetailService warehouseWarehousingDetailService;
 
 	@Override
 	public IPage<WarehouseWarehousingEntryVO> selectWarehouseWarehousingEntryPage(IPage<WarehouseWarehousingEntryVO> page, WarehouseWarehousingEntryVO warehouseWarehousingEntry) {
@@ -51,4 +60,26 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 		return warehouseWarehousingEntryList;
 	}
 
+	@Override
+	public Boolean saveOrUpdateOwn(WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO) {
+		List<WarehouseWarehousingDetailEntity> list = warehouseWarehousingEntryDTO.getList();
+		WarehouseWarehousingEntryEntity warehouseWarehousingEntry = new WarehouseWarehousingEntryEntity();
+		BeanUtil.copyProperties(warehouseWarehousingEntryDTO,warehouseWarehousingEntry);
+		if(ObjectUtils.isNotNull(warehouseWarehousingEntryDTO.getId())){
+			//修改
+			this.updateById(warehouseWarehousingEntry);
+		}else{
+			//添加
+			warehouseWarehousingEntry.setSource("添加");
+			warehouseWarehousingEntry.setConditions("1");
+			this.save(warehouseWarehousingEntry);
+		}
+		//添加入库明细
+		list.forEach(i ->
+			i.setWarehousingEntryId(warehouseWarehousingEntry.getId())
+		);
+		warehouseWarehousingDetailService.saveBatch(list);
+		return true;
+	}
+
 }