Browse Source

创建标签的开发完成

master
赵雪冰 2 years ago
parent
commit
0e15e0822e
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java
  3. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainBaseVO.java
  4. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java
  5. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java
  6. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java
  7. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java
  8. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java
  9. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java

@ -120,4 +120,6 @@ public class UnplannedissueRequestDetailController {
ExcelUtils.write(response, "计划外出库申请子.xls", "数据", UnplannedissueRequestDetailExcelVO.class, datas);
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java

@ -271,4 +271,6 @@ public class UnplannedissueRequestMainController {
return success(count > 0);
}
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainBaseVO.java

@ -52,7 +52,7 @@ public class UnplannedissueRequestMainBaseVO {
private LocalDateTime dueTime;
@Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "部门不能为空")
// @NotNull(message = "部门不能为空")
private String departmentCode;
@Schema(description = "状态")
@ -75,19 +75,19 @@ public class UnplannedissueRequestMainBaseVO {
private String fromAreaCodes;
@Schema(description = "自动提交", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "自动提交不能为空")
// @NotNull(message = "自动提交不能为空")
private String autoCommit;
@Schema(description = "自动通过", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "自动通过不能为空")
// @NotNull(message = "自动通过不能为空")
private String autoAgree;
@Schema(description = "自动执行", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "自动执行不能为空")
// @NotNull(message = "自动执行不能为空")
private String autoExecute;
@Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "直接生成记录不能为空")
// @NotNull(message = "直接生成记录不能为空")
private String directCreateRecord;
}

11
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java

@ -120,4 +120,15 @@ public class UnplannedreceiptRequestDetailController {
ExcelUtils.write(response, "计划外入库申请子.xls", "数据", UnplannedreceiptRequestDetailExcelVO.class, datas);
}
/**
* 更新 计划外入库 子表数据 包装号字段
* @param number 包装号
*/
@PutMapping("/updateDetailPackingNumber")
@Operation(summary = "更新计划外入库申请子")
public CommonResult<Boolean> updateUnplannedreceiptPackingNumber(@RequestParam("id") Long id, @RequestParam("number") String number) {
Integer updateCnt = unplannedreceiptRequestDetailService.updateUnplannedreceiptPackingNumber(id, number);
return success(updateCnt > 0);
}
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java

@ -80,4 +80,5 @@ public interface UnplannedissueRequestDetailService {
*/
List<UnplannedissueRequestDetailDO> getUnplannedissueRequestDetailList(UnplannedissueRequestDetailExportReqVO exportReqVO);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java

@ -12,6 +12,7 @@ import com.win.module.wms.dal.dataobject.balance.BalanceDO;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestDetailMapper;
@ -148,4 +149,5 @@ public class UnplannedissueRequestDetailServiceImpl implements UnplannedissueReq
return unplannedissueRequestDetailMapper.selectList(exportReqVO);
}
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java

@ -247,6 +247,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
for(UnplannedissueRequestDetailDO unplannedreceiptRequestDetailDO: subDOList){
unplannedreceiptRequestDetailDO.setMasterId(unplannedissueRequestMainDO.getId()); // masterId
unplannedreceiptRequestDetailDO.setNumber(unplannedissueRequestMainDO.getNumber());// 单据号
unplannedreceiptRequestDetailDO.setId(null);
}
unplannedissueRequestDetailMapper.insertBatch(subDOList);
return unplannedissueRequestMainDO;

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java

@ -82,4 +82,11 @@ public interface UnplannedreceiptRequestDetailService {
List<UnplannedreceiptRequestDetailDO> selectList(Long masterId);
/**
* 更新子表包装号
* @param id 主键ID
* @param number 包装号
* @return
*/
Integer updateUnplannedreceiptPackingNumber(Long id, String number);
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java

@ -140,4 +140,12 @@ public class UnplannedreceiptRequestDetailServiceImpl implements Unplannedreceip
return unplannedreceiptRequestDetailMapper.selectList(masterId);
}
@Override
public Integer updateUnplannedreceiptPackingNumber(Long id, String number) {
UnplannedreceiptRequestDetailDO unplannedreceiptRequestDetailDO = new UnplannedreceiptRequestDetailDO();
unplannedreceiptRequestDetailDO.setId(id);
unplannedreceiptRequestDetailDO.setPackingNumber(number);
return unplannedreceiptRequestDetailMapper.updateById(unplannedreceiptRequestDetailDO);
}
}

Loading…
Cancel
Save