|
@@ -5,7 +5,7 @@ import com.iamberry.rst.core.pts.Produce;
|
|
import com.iamberry.rst.core.pts.ProduceProcess;
|
|
import com.iamberry.rst.core.pts.ProduceProcess;
|
|
import com.iamberry.rst.faces.pts.ProduceService;
|
|
import com.iamberry.rst.faces.pts.ProduceService;
|
|
import com.iamberry.rst.service.pts.mapper.ProduceMapper;
|
|
import com.iamberry.rst.service.pts.mapper.ProduceMapper;
|
|
-import com.iamberry.rst.util.ProduceNumberUtil;
|
|
|
|
|
|
+import com.iamberry.rst.util.ProduceNoUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -66,14 +66,14 @@ public class ProduceServiceImpl implements ProduceService {
|
|
|
|
|
|
//添加产品
|
|
//添加产品
|
|
public Integer saveProduce(Produce produce){
|
|
public Integer saveProduce(Produce produce){
|
|
- produce.setProduceNo(ProduceNumberUtil.getProduceNo());
|
|
|
|
|
|
+ produce.setProduceNo(ProduceNoUtil.getProduceNo());
|
|
produce.setProduceStatus(1);
|
|
produce.setProduceStatus(1);
|
|
int flag = produceMapper.saveProduce(produce);
|
|
int flag = produceMapper.saveProduce(produce);
|
|
Integer produceId = produce.getProduceId(); // 获取产品主键
|
|
Integer produceId = produce.getProduceId(); // 获取产品主键
|
|
|
|
|
|
for (int i=0; i<produce.getProcess().size();i++){
|
|
for (int i=0; i<produce.getProcess().size();i++){
|
|
produce.getProcess().get(i).setProduceId(produceId); //产品id
|
|
produce.getProcess().get(i).setProduceId(produceId); //产品id
|
|
- produce.getProcess().get(i).setProcessNo(ProduceNumberUtil.getProcessNo(i)); //工序编号
|
|
|
|
|
|
+ produce.getProcess().get(i).setProcessNo(ProduceNoUtil.getProcessNo(i)); //工序编号
|
|
produce.getProcess().get(i).setProcessStatus(1); //状态
|
|
produce.getProcess().get(i).setProcessStatus(1); //状态
|
|
produce.getProcess().get(i).setProcessSort(i); //排序字段
|
|
produce.getProcess().get(i).setProcessSort(i); //排序字段
|
|
|
|
|
|
@@ -83,7 +83,7 @@ public class ProduceServiceImpl implements ProduceService {
|
|
for(int j=0; j<produceProcess.getNodes().size();j++){
|
|
for(int j=0; j<produceProcess.getNodes().size();j++){
|
|
produceProcess.getNodes().get(j).setProduceId(produceId);
|
|
produceProcess.getNodes().get(j).setProduceId(produceId);
|
|
produceProcess.getNodes().get(j).setProcessId(processId);
|
|
produceProcess.getNodes().get(j).setProcessId(processId);
|
|
- produceProcess.getNodes().get(j).setNodeNo(ProduceNumberUtil.getNodeNo(j)); //节点编号
|
|
|
|
|
|
+ produceProcess.getNodes().get(j).setNodeNo(ProduceNoUtil.getNodeNo(j)); //节点编号
|
|
}
|
|
}
|
|
this.saveProcessNodeList(produceProcess.getNodes());
|
|
this.saveProcessNodeList(produceProcess.getNodes());
|
|
}
|
|
}
|