Browse Source

生产计划修改

master
陈薪名 2 years ago
parent
commit
c8803b50e5
  1. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java
  4. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java

@ -35,6 +35,9 @@ public class ProductionDetailPageReqVO extends PageParam {
@Schema(description = "备注")
private String remark;
@Schema(description = "主表ID")
private String masterId;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java

@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO;
import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO;
import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
import com.win.module.wms.dal.dataobject.work.WorkDetailDO;
import org.apache.ibatis.annotations.Mapper;
@ -23,6 +24,7 @@ public interface ProductionDetailMapper extends BaseMapperX<ProductionDetailDO>
default PageResult<ProductionDetailDO> selectPage(ProductionDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ProductionDetailDO>()
.eq(ProductionDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion())
.eqIfPresent(ProductionDetailDO::getGoodQty, reqVO.getGoodQty())
.eqIfPresent(ProductionDetailDO::getNotGoodQty, reqVO.getNotGoodQty())

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java

@ -31,7 +31,7 @@ public interface ProductionMainService {
*
* @param updateReqVO 更新信息
*/
void updateProductionMain(@Valid ProductionMainUpdateReqVO updateReqVO);
Integer updateProductionMain(@Valid ProductionMainUpdateReqVO updateReqVO);
/**
* 删除生产计划主

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java

@ -155,12 +155,15 @@ public class ProductionMainServiceImpl implements ProductionMainService {
@Override
@Transactional
public void updateProductionMain(ProductionMainUpdateReqVO updateReqVO) {
public Integer updateProductionMain(ProductionMainUpdateReqVO updateReqVO) {
// 校验存在
validateProductionMainExists(updateReqVO.getId());
// 更新
ProductionMainDO updateObj = ProductionMainConvert.INSTANCE.convert(updateReqVO);
productionMainMapper.updateById(updateObj);
this.validateProductionMainUpdate(updateObj);
//增加操作记录
trendsApi.createTrends(updateObj.getId(), "productionMain", "更新了生产计划", TrendsTypeEnum.UPDATE);
return productionMainMapper.updateById(updateObj);
}
@Override
@ -260,6 +263,23 @@ public class ProductionMainServiceImpl implements ProductionMainService {
bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion());
}
private void validateProductionMainUpdate(ProductionMainDO mainDo) {
// 校验车间 基础信息
workshopService.selectWorkshopExist(mainDo.getWorkshop());
// 校验生产线基础信息
productionlineService.productionLineCodeExist(mainDo.getProductionLine());
// 校验班组基础信息
teamService.selectTeamExist(mainDo.getTeam());
// 校验班次基础信息
shiftService.selectShiftExist(mainDo.getShift());
// 校验生产线和物品关系
// productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProductionLine(), detailDo.getItemCode());
// 校验物品和bom关系
// bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion());
}
/**
* 主表校验导入
* @param mainDo

Loading…
Cancel
Save