wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

批次生产加工个别接口修改

Browse Source
This commit is contained in:
hy2250089
2019-12-15 16:44:27 +08:00
parent 2ace6dc2f3
commit 333f63482e
12 changed files with 8110 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms-produce-manage/.gitignore vendored
View File

@@ -1,11 +1,13 @@
##ignore this file##
/target/
target/ 
logs/
.classpath
.project
.factorypath
.settings
.apt_generated
.idea
### IntelliJ IDEA ###
.idea

12
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java → wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java
View File

@@ -8,9 +8,19 @@ import java.util.ArrayList;
* @Date: 2019/10/30 22:52
* @Version 1.0
*/
public class ProductProcessHaveProcess extends ProductProcess {
public class ProductAndProcess {
private ProductProcess productProcess;
private static MtAloneProcess[] processes;
public ProductProcess getProductProcess() {
return productProcess;
}
public void setProductProcess(ProductProcess productProcess) {
this.productProcess = productProcess;
}
public static MtAloneProcess[] getProcesses() {
return processes;
}

10
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
View File

@@ -2,9 +2,19 @@ package com.deer.wms.produce.manage.model;
import com.deer.wms.project.seed.core.service.QueryParams;
import java.util.Date;
/**
* Created by guo on 2019/09/24.
*/
public class ProductProcessParams extends QueryParams {
private Date createDate;
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}

4
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java
View File

@@ -1,8 +1,8 @@
package com.deer.wms.produce.manage.service;
import com.deer.wms.intercept.common.data.CurrentUser;
import com.deer.wms.produce.manage.model.ProductAndProcess;
import com.deer.wms.produce.manage.model.ProductProcess;
import com.deer.wms.produce.manage.model.ProductProcessHaveProcess;
import com.deer.wms.produce.manage.model.ProductProcessParams;
import com.deer.wms.produce.manage.model.ProductProcessVo;
import com.deer.wms.project.seed.core.service.Service;
@@ -17,5 +17,5 @@ public interface ProductProcessService extends Service<ProductProcess, Integer>
void save(ProductProcess productProcess, CurrentUser currentUser);
void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser);
void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser);
}

42
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -58,48 +59,29 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
}
@Override
public void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser) {
public void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser) {
//首先保存批次产品加工信息
ProductProcess productProcess = new ProductProcess();
ProductProcess productProcess = productAndProcess.getProductProcess();
Date date = new Date();
productProcess.setOperatorId(1);
productProcess.setOperatorId(currentUser.getUserId());
productProcess.setCreateTime(date);
productProcess.setUpdateTime(date);
productProcess.setVersion("1.1");
productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE);
productProcess.setSalesNumber(productProcessHaveProcess.getSalesNumber());
productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD"));
productProcess.setWorkOrderName(productProcessHaveProcess.getWorkOrderName());
productProcess.setDeliveryCode(productProcessHaveProcess.getDeliveryCode());
productProcess.setPlanBeginTime(productProcessHaveProcess.getPlanBeginTime());
productProcess.setPlanFinishTime(productProcessHaveProcess.getPlanFinishTime());
productProcess.setClientId(productProcessHaveProcess.getClientId());
productProcess.setClientName(productProcessHaveProcess.getClientName());
productProcess.setContractCode(productProcessHaveProcess.getContractCode());
productProcess.setContractName(productProcessHaveProcess.getContractName());
productProcess.setProductProcessCode(productProcessHaveProcess.getProductProcessCode());
productProcess.setProductProcessName0(productProcessHaveProcess.getProductProcessName0());
productProcess.setSpecification(productProcessHaveProcess.getSpecification());
productProcess.setProcessPrice(productProcessHaveProcess.getProcessPrice());
productProcess.setLen(productProcessHaveProcess.getLen());
productProcess.setBatchCode(productProcessHaveProcess.getBatchCode());
productProcess.setBatchOrderCode(productProcessHaveProcess.getBatchOrderCode());
productProcess.setShrinkage((productProcessHaveProcess.getDetectionLen()/productProcessHaveProcess.getLen())*100+"%");
productProcess.setPiNum(productProcessHaveProcess.getPiNum());
productProcess.setProcessContent(productProcessHaveProcess.getProcessContent());
productProcess.setMerchandiserId(productProcessHaveProcess.getMerchandiserId());
productProcess.setMerchandiserName(productProcessHaveProcess.getMerchandiserName());
productProcess.setMemo(productProcessHaveProcess.getMemo());
productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%");
productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW);
productProcess.setProductAnnexCode(productProcessHaveProcess.getProductAnnexCode());
productProcess.setCompanyId(1);
productProcess.setCompanyId(currentUser.getCompanyId());
productProcessMapper.insert(productProcess);
//其次保存由前端获取的工序信息
MtAloneProcess[] processes = ProductProcessHaveProcess.getProcesses();
for (int i = 0; i < processes.length; i++) {
processService.save(processes[i]);
MtAloneProcess[] processes = productAndProcess.getProcesses();
if(null != processes) {
List<MtAloneProcess> processesList = new ArrayList<>(processes.length);
Collections.addAll(processesList, processes);
processService.save(processesList);
}
}
}

1
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java
View File

@@ -128,7 +128,6 @@ public class ProcessBomController {
/**
* hy
*
* 根据选择的产品名称来展示产品其他数据和工序数据
* @param params
* @param currentUser

50
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
View File

@@ -3,8 +3,8 @@ package com.deer.wms.produce.manage.web;
import com.deer.wms.intercept.annotation.Authority;
import com.deer.wms.intercept.annotation.User;
import com.deer.wms.intercept.common.data.CurrentUser;
import com.deer.wms.produce.manage.model.ProductAndProcess;
import com.deer.wms.produce.manage.model.ProductProcess;
import com.deer.wms.produce.manage.model.ProductProcessHaveProcess;
import com.deer.wms.produce.manage.model.ProductProcessParams;
import com.deer.wms.produce.manage.model.ProductProcessVo;
import com.deer.wms.produce.manage.service.ProcessBomService;
@@ -16,6 +16,8 @@ import com.deer.wms.project.seed.core.result.ResultGenerator;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +41,7 @@ public class ProductProcessController {
private ProcessBomService processBomService;
/**
* hy
* 生成某种产品某一批次的生产加工单
* 需要调用对应产品bom
* @param productProcess
@@ -79,15 +82,27 @@ public class ProductProcessController {
return ResultGenerator.genSuccessResult(productProcess);
}
@OperateLog(description = "生产计划分页查询", type = "查询")
@ApiOperation(value = "生产计划列表分页", notes = "生产计划列表分页")
/**
* hy
* 批次生产加工单分页查询
* @param params
* @param currentUser
* @return
*/
@ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询")
@ApiImplicitParams({
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
})
@OperateLog(description = "批次生产加工单分页查询", type = "查询")
@GetMapping("/list")
public Result list(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
//if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//}
params.setCompanyId(currentUser.getCompanyId());
params.setCompanyId(1);
PageHelper.startPage(params.getPageNum(), params.getPageSize());
List<ProductProcessVo> list = productProcessService.findList(params);
PageInfo pageInfo = new PageInfo(list);
@@ -95,21 +110,24 @@ public class ProductProcessController {
}
/**
*新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息
* hy
* @param productProcessHaveProcess
* 新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息
* @param productAndProcess
* @param currentUser
* @return
*/
@OperateLog(description = "批次生产加工及工序保存更新", type = "保存更新")
@ApiOperation(value = "批次生产加工及工序保存更新", notes = "批次生产加工及工序保存更新")
@PostMapping("/addAndUpdateProProcAndProc")
public Result addAndUpdateProProcAndProc(@RequestBody ProductProcessHaveProcess productProcessHaveProcess, @ApiIgnore @User CurrentUser currentUser) {
//if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//}
@ApiImplicitParams({
@ApiImplicitParam(name = "productAndProcess", value = "批次生产加工及工序", paramType = "body", dataType = "ProductAndProcess", required = true)
})
@OperateLog(description = "批次生产加工及工序保存", type = "保存")
@PostMapping("/saveProdAndProc")
public Result saveProdAndProc(@RequestBody ProductAndProcess productAndProcess, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
productProcessService.addAndUpdateProProcAndProc(productProcessHaveProcess, currentUser);
productProcessService.saveProdAndProc(productAndProcess, currentUser);
return ResultGenerator.genSuccessResult();
}