Skip to content

T
topsun-bpm
Commit 2ccc6714 authored by wanghang's avatar wanghang
Browse files
Options

查询慢的请求改为sql查询

parent 7ffd0f2e
Hide whitespace changes
Inline Side-by-side
Showing with 657 additions and 220 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ 2ccc6714
......@@ -14,6 +14,7 @@ function bindQueryEvent() {
Public.ajax(web_app.name + '/proofingApply/queryProductLooked.ajax',{productId:data.productId},function (newData){
$('#submitForm').formSet(newData);
})
$('#productCategoryName').val(data.productCategoryName)
showTechnologyTable(data.productId);
}
});
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @ 2ccc6714
......@@ -8,7 +8,7 @@
<x:script src='/biz/topsun/proofing/technologyAndBom/technologyAndBom.js'/>
<div class="container-fluid" style="padding: 10px;">
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="打样查询单" needStatus="false" needPerson="true"/>
<x:billTitle title="打样制造单" needStatus="false" needPerson="true"/>
<div class="blank_div clearfix"></div>
<form class="hg-form" method="post" action="" id="submitForm">
<div><h3>基本信息</h3></div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.js
View file @ 2ccc6714
......@@ -11,12 +11,7 @@ function initializateUI() {
function loadTechnologyListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
// addHandler: function(){
// addHandler();
// },
// updateHandler: function(){
// updateHandler();
// },
deleteHandler: deleteHandler,
});
gridManager = UICtrl.grid("#proofingMakeTableGrid", {
......@@ -148,7 +143,7 @@ function loadTechnologyListGrid() {
],
dataAction: "server",
url: web_app.name + '/proofingMake/slicedQueryProofingMake.ajax',
pageSize: 20,
pageSize: 10,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstrcutionApply.js
View file @ 2ccc6714
......@@ -28,6 +28,30 @@ function saveForm(){
});
}
function saveForm(){
var _self=this;
$('#submitForm').ajaxSubmit({
url : web_app.name + '/proofingMake/saveProofingMake.ajax',
param:{},
success : function(data) {
if (data == "1"){
Public.successTip("保存成功！");
}
_self.close();
}
});
let productId=$("#productId").val();
let proofingMakeNo=$("#proofingMakeNo").val();
UICtrl.addTabItem({
tabid: 'workInstrcutionApply'+proofingMakeNo,
text: "作业指导申请书",
url: web_app.name + '/workInstrcutionApply/forwardWorkInstrcutionApply.do?productId='+productId
});
}
function resetForm(obj) {
$(obj).formClean();
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstrcutionApply.jsp
View file @ 2ccc6714
......@@ -7,6 +7,7 @@
<x:script src='/biz/topsun/proofing/workInstrcutionApply.js'/>
<div class="container-fluid" style="padding: 10px;">
<form class="hg-form" method="post" action="" id="submitForm">
<x:billTitle title="打样制造单" needStatus="false" needPerson="true"/>
<div><h3>基本信息</h3></div>
<div style="margin: 10px;">
<div class="hg-form-cols">
......@@ -48,7 +49,7 @@
</div>
<div class="blank_div clearfix"></div>
<div style="min-height: 40px; text-align: center;">
<x:button value="保存" onclick="" icon="fa-save"/>
<x:button value="保存" onclick="saveForm()" icon="fa-save"/>
<x:button value="重置" onclick="resetForm(this.form)" icon="fa-history"/>
</div>
</form>
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyApplication.java
View file @ 2ccc6714
......@@ -3,26 +3,29 @@ package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import java.util.List;
import java.util.Map;
public interface ProofingApplyApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingApply.xml";
String PROCESS_DEFINITION_KEY = "proofingProc";
ProofingApply loadProofingApplyById(String id);
Map<String, Object> slicedQuery(ProofingApplyQuery query);
List<ProofingApply> getProofingApplyList();
ProofingApplyAndProductVo getProofingApplyByProofingApplyNo(String proofingApplyNo);
/**
* 根据ProofingApply获得样品和产品外观信息
* @param id
* @return
*/
ProofingApplyAndProductVo getProofingApplyAndLookedVoByPAId(String id);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeApplication.java 0 → 100644
View file @ 2ccc6714
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.query.ProofingApplyAndProductQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.topsunit.query.annotations.Mapper;
import java.util.Map;
/**
* @author yonghuan
*/
public interface ProofingMakeApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingMake.xml";
Map<String, Object> slicedProofingMakeQuery(ProofingMakeQueryRequest query);
/**
*编辑打样制造信息
* @param proofingMake
*/
void saveProofingMake(ProofingMake proofingMake);
ProofingMakeVo getProofingMakeVoById(String proofingMakeId);
}
topsun/src/main/java/com/huigou/topsun/proofing/service/WorkInstrcutionApplyService.java → topsun/src/main/java/com/huigou/topsun/proofing/application/WorkInstrcutionApplyApplication.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.service;
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply;
public interface WorkInstrcutionApplyService {
public interface WorkInstrcutionApplyApplication {
void saveWorkInstrcutionApply(WorkInstrcutionApply workInstrcutionApply);
}
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.product.application.ProductCategoryApplication;
import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.product.domain.Product;
import com.huigou.topsun.product.domain.ProductCategory;
import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.product.domain.ProductPublishedConf;
import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
import com.huigou.topsun.product.repository.ProductRepository;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import com.huigou.topsun.proofing.mapper.ProofingApplyMapper;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingApplyRepository;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.util.ClassHelper;
......@@ -38,14 +39,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
@Autowired
private ProofingApplyRepository proofingApplyRepository;
@Autowired
private ProofingApplyMapper proofingApplyMapper;
@Autowired
private ProductLookedApplication productLookedApplication;
@Autowired
private ProductCategoryApplication productCategoryApplication;
@Autowired
private ProductRepository productRepository;
@Autowired
private ProductPublishedConfRepository productPublishedConfRepository;
......@@ -56,7 +49,8 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
@Override
public Map<String, Object> slicedQuery(ProofingApplyQuery query) {
return proofingApplyMapper.slicedQuery(query);
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedQuery");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
@Transactional(propagation = Propagation.REQUIRES_NEW)
......@@ -118,17 +112,12 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
}
}
@Override
public List<ProofingApply> getProofingApplyList() {
return proofingApplyRepository.findAll();
}
@Override
public ProofingApplyAndProductVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyNo(proofingApplyNo);
ProofingApplyAndProductVo proofingApplyAndLookedVo = this.getProofingApplyAndLookedVoByPAId(proofingApply.getId());
ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
if(productPublishedConf!=null){
BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo);
}
......@@ -138,19 +127,9 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
@Override
public ProofingApplyAndProductVo getProofingApplyAndLookedVoByPAId(String id) {
ProofingApplyAndProductVo proofingApplyAndLookedVo = new ProofingApplyAndProductVo();
ProofingApply proofingApply = this.loadProofingApplyById(id);
ProductLooked productLooked =new ProductLooked();
productLooked.setProductId(proofingApply.getProductId());
ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
Product product = productRepository.findOne(proofingApply.getProductId());
ProductCategory productCategory = productCategoryApplication.getProductCategoryById(product.getProductCategoryId());
BeanUtils.copyProperties(proofingApply,proofingApplyAndLookedVo);
BeanUtils.copyProperties(newProductLooked,proofingApplyAndLookedVo);
proofingApplyAndLookedVo.setProductCategoryName(productCategory.getProductCategoryName());
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryProofingApplyAndProductQuery");
return this.sqlExecutorDao.queryToObject(queryDescriptor.getSql(), ProofingApplyAndProductVo.class,id);
}
return proofingApplyAndLookedVo;
}
}
topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java → topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.service.impl;
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.product.domain.ProductPublishedConf;
import com.huigou.topsun.product.repository.ProductLookedRepository;
import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingApplyRepository;
import com.huigou.topsun.proofing.repository.ProofingMakeRepository;
import com.huigou.topsun.proofing.service.ProofingMakeService;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.Map;
/**
* @author 16508
* @description 针对表【technology(工艺)】的数据库操作Service实现
* @createDate 2023-11-22 11:04:03
*/
@Service
public class ProofingMakeServiceImpl implements ProofingMakeService {
public class ProofingMakeApplicationImpl extends BaseApplication implements ProofingMakeApplication {
@Autowired
ProofingMakeRepository proofingMakeRepository;
@Autowired
ProofingApplyRepository proofingApplyRepository;
@Autowired
ProductLookedRepository productLookedRepository;
@Autowired
ProductPublishedConfRepository productPublishedConfRepository;
public List<ProofingMakeVo> getProofingMakeVoList(){
List<ProofingMake> makeAll = proofingMakeRepository.findAll();
List<ProofingMakeVo> makeVoList = new ArrayList<>();
for (ProofingMake proofingMake : makeAll) {
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
ProofingMakeVo proofingMakeVo = getProofingMakeVo(proofingMake, proofingApply);
makeVoList.add(proofingMakeVo);
}
return makeVoList;
}
@Override
public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
ProductLooked productLooked = productLookedRepository.findByProductId(proofingApply.getProductId());
ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
return this.getProofingMakeVo(proofingApply,proofingMake,productLooked,productPublishedConf);
public Map<String, Object> slicedProofingMakeQuery(ProofingMakeQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingMakeList");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
/**
* 分解ProofingMake
* @param proofingMake
*/
@Override
public void saveProofingMakeVo(ProofingMake proofingMake) {
public void saveProofingMake(ProofingMake proofingMake) {
proofingMakeRepository.save(proofingMake);
}
@Override
public void deleteProofingMakeVo(String proofingMakeId) {
proofingMakeRepository.delete(proofingMakeId);
}
/**
* 生成ProofingMakeVo类
* @return 填充过数据后的ProofingMakeVo
*/
public ProofingMakeVo getProofingMakeVo(Object... objs){
public ProofingMakeVo getProofingMakeVoById(String proofingMakeId) {
ProofingMakeVo proofingMakeVo = new ProofingMakeVo();
for (Object obj : objs) {
if(obj!=null){
BeanUtils.copyProperties(obj, proofingMakeVo);
}
}
ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
ProofingApply proofingApply = proofingApplyRepository.findByProofingApplyId(proofingMake.getProofingApplyId());
BeanUtils.copyProperties(proofingMake,proofingMakeVo);
BeanUtils.copyProperties(proofingApply,proofingMakeVo);
return proofingMakeVo;
}
}
}
topsun/src/main/java/com/huigou/topsun/proofing/service/impl/WorkInstrcutionApplyServiceImpl.java → topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstrcutionApplyApplicationImpl.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.service.impl;
package com.huigou.topsun.proofing.application.impl;
import com.huigou.topsun.proofing.application.WorkInstrcutionApplyApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply;
import com.huigou.topsun.proofing.repository.WorkInstrcutionApplyRepository;
import com.huigou.topsun.proofing.service.WorkInstrcutionApplyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Service;
@Service
public class WorkInstrcutionApplyServiceImpl implements WorkInstrcutionApplyService {
public class WorkInstrcutionApplyApplicationImpl implements WorkInstrcutionApplyApplication {
@Autowired
WorkInstrcutionApplyRepository workInstrcutionApplyRepository;
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ 2ccc6714
......@@ -7,16 +7,20 @@ import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.query.ProofingApplyAndProductQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import com.huigou.topsun.technology.application.TechnologyApplication;
import com.huigou.topsun.technology.application.TechnologyProcessApplication;
import com.huigou.topsun.technology.domain.model.Technology;
import com.huigou.topsun.technology.domain.query.TechnologyQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
......@@ -38,16 +42,11 @@ public class ProofingApplyController extends CommonController {
@Resource
private TechnologyProcessApplication technologyProcessApplication;
public String slicedTechnologyProcessList(){
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
}
public String slicedProofingApplyList(){
List<ProofingApply> proofingApplyList = proofingApplyApplication.getProofingApplyList();
Map<String,Object> map =new HashMap();
map.put("Rows",proofingApplyList);
SDO sdo = this.getSDO();
ProofingApplyQuery queryRequest = sdo.toQueryRequest(ProofingApplyQuery.class);
Map<String, Object> map = proofingApplyApplication.slicedQuery(queryRequest);
return toResult(map);
}
......@@ -73,20 +72,6 @@ public class ProofingApplyController extends CommonController {
return forward("proofingApply",proofingApply);
}
/**
* 展示工序
* @return
*/
public String slicedTechnologyList(){
SDO sdo = this.getSDO();
String productId = sdo.getString("productId");
List<Technology> allByProduct= technologyApplication.findAllByProductId(productId);
Map<String,Object> map =new HashMap();
map.put("Rows",allByProduct);
return toResult(map);
}
/**
* 工作流审核跳转页面
* @return
......@@ -110,4 +95,28 @@ public class ProofingApplyController extends CommonController {
ProductLooked newProductLooked = productLookedApplication.getProductLookedByEntity(productLooked);
return toResult(newProductLooked);
}
/**
* 展示工艺
* @return
*/
public String slicedTechnologyList(){
SDO sdo = this.getSDO();
TechnologyQueryRequest queryRequest = sdo.toQueryRequest(TechnologyQueryRequest.class);
Map<String, Object> map = technologyApplication.slicedTechnologyList(queryRequest);
return toResult(map);
}
/**
* 展示工序
* @return
*/
public String slicedTechnologyProcessList(){
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
}
}
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ 2ccc6714
......@@ -3,11 +3,13 @@ package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.service.ProofingMakeService;
import com.huigou.uasp.annotation.ControllerMapping;
......@@ -32,7 +34,7 @@ public class ProofingMakeController extends CommonController {
}
@Autowired
ProofingMakeService proofingMakeService;
ProofingMakeApplication proofingMakeApplication;
@Autowired
ProofingApplyApplication proofingApplyApplication;
@Autowired
......@@ -61,9 +63,9 @@ public class ProofingMakeController extends CommonController {
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询打样制造表")
public String slicedQueryProofingMake() {
List<ProofingMakeVo> proofingMakeList = proofingMakeService.getProofingMakeVoList();
Map<String,Object> map =new HashMap();
map.put("Rows",proofingMakeList);
SDO sdo = this.getSDO();
ProofingMakeQueryRequest queryRequest = sdo.toQueryRequest(ProofingMakeQueryRequest.class);
Map<String, Object> map = proofingMakeApplication.slicedProofingMakeQuery(queryRequest);
return toResult(map);
}
......@@ -74,7 +76,8 @@ public class ProofingMakeController extends CommonController {
SDO sdo = this.getSDO();
String id = sdo.getId();
this.putAttribute("isDetailPage","true");
ProofingMakeVo proofingMakeVo =(id==null||"".equals(id))?null:proofingMakeService.getProofingMakeVoById(id);
ProofingMakeVo proofingMakeVo =(id==null||"".equals(id))?null:proofingMakeApplication.getProofingMakeVoById(id);
return forward("proofingMake",proofingMakeVo);
}
......@@ -85,20 +88,20 @@ public class ProofingMakeController extends CommonController {
public String saveProofingMake(){
SDO sdo = this.getSDO();
ProofingMake proofingMake = sdo.toObject(ProofingMake.class);
proofingMakeService.saveProofingMakeVo(proofingMake);
proofingMakeApplication.saveProofingMake(proofingMake);
return success(proofingMake);
}
public String deleteProofingMakeByProofingMakeId(){
SDO sdo = this.getSDO();
String proofingMakeId = sdo.getString("ids");
proofingMakeService.deleteProofingMakeVo(proofingMakeId);
return success();
}
// public String deleteProofingMakeByProofingMakeId(){
// SDO sdo = this.getSDO();
// String proofingMakeId = sdo.getString("ids");
// proofingMakeApplication.deleteProofingMakeVo(proofingMakeId);
// return success();
// }
/**
* 根据测试单号回显相关数据
* 根据单号回显相关数据
* @return
*/
public String queryProofingApply(){
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/WorkInstrcutionApplyController.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.controller;
import com.huigou.topsun.product.application.ProductApplication;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.application.WorkInstrcutionApplyApplication;
import com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply;
import com.huigou.topsun.proofing.service.WorkInstrcutionApplyService;
import com.huigou.topsun.resource.vo.ResourceTypeVo;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.UUID;
......@@ -30,7 +23,7 @@ public class WorkInstrcutionApplyController extends CommonController {
@Autowired
ProductApplication productApplication;
@Autowired
WorkInstrcutionApplyService workInstrcutionApplyService;
WorkInstrcutionApplyApplication workInstrcutionApplyApplication;
public String forwardWorkInstrcutionApply(){
......@@ -54,7 +47,7 @@ public class WorkInstrcutionApplyController extends CommonController {
public String saveWorkInstrcutionApply(){
SDO sdo = this.getSDO();
WorkInstrcutionApply workInstrcutionApply = sdo.toObject(WorkInstrcutionApply.class);
workInstrcutionApplyService.saveWorkInstrcutionApply(workInstrcutionApply);
workInstrcutionApplyApplication.saveWorkInstrcutionApply(workInstrcutionApply);
return toResult(workInstrcutionApply);
}
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyAndProductQueryRequest.java 0 → 100644
View file @ 2ccc6714
package com.huigou.topsun.proofing.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import java.util.Date;
/**
* 样品申请与外观
*/
@Data
public class ProofingApplyAndProductQueryRequest extends QueryAbstractRequest {
/**
* 申请单proofingApplyId
*/
private String proofingApplyId;
/**
* 申请单id
*/
private String id;
/**
* 申请单号
*/
private String proofingApplyNo;
/**
* 产品id
*/
private String productId;
/**
* 客户id
*/
private String customerId;
/**
* 品牌编号名称
*/
// private String productCategoryName;
/**
* 版面需求时间
*/
private Date proofingApplyPageNeedTime;
/**
* 完成日期
*/
private Date proofingApplyCompleteDate;
/**
* 中文样品名
*/
private String proofingApplySampleCnName;
/**
* 英文样品名
*/
private String proofingApplySampleEnName;
/**
* 样品版次
*/
private Integer proofingApplySampleVersion;
/**
* 样品规格
*/
private Integer proofingApplySampleSize;
/**
* 样品数量
*/
private Long proofingApplySampleNum;
/**
* 产量情况
*/
private String proofingApplyOutputSituation;
/**
* 产品代号
*/
private String proofingApplyProductNo;
/**
* 打样形式
*/
private String proofingType;
/**
* 分配方式
*/
private String proofingApplyAllocationType;
/**
* 表面处理
*/
private String proofingApplySurfaceTreatment;
/**
* NG重新打样原因
*/
private String proofingApplyNgReReason;
/**
*申请单状态
*/
private String proofingApplyApplicationStatus;
/**
*测试标准
*/
private String proofingApplyTestStandard;
/**
*测试标准
*/
private String isOutput;
/**
*测试标准
*/
private String isOut;
/**
*测试标准
*/
private String isChange;
/**
* 产品类别
*/
private String productCategoryName;
/**
* 长;单位cm
*/
private Double productLength;
/**
* 宽;单位cm
*/
private Double productWidth;
/**
* 高;单位cm
*/
private Double productHeight;
/**
* 厚度;单位mm
*/
private Double productThick;
/**
* 成品克重;单位g
*/
private Double productWeight;
/**
* 角型
*/
private String productAngleType;
/**
* 角度(单位mm)
*/
private Double productAngle;
/**
* 孔径(单位mm)
*/
private Double productAperture;
/**
* 单层厚(单位丝)
*/
private Integer productSingleLayer;
/**
* 单重(单位KG)
*/
private Double productSingleWeight;
/**
* 层数
*/
private Integer productLayerNum;
/**
* 排版参数配置ID
*/
private String productPublishedConfId;
/**
* 模数
*/
private Integer modulus;
/**
* 行数
*/
private Integer rowNum;
/**
* 列数
*/
private Integer columnNum;
/**
* 搭版数
*/
private Integer contactNum;
/**
* 行双刀位(单位mm)
*/
private Double rowDoubleBlade;
/**
* 列双刀位(单位mm)
*/
private Double columnDoubleBlade;
/**
* 派工倍数
*/
private Integer dispatchMultiple;
/**
* 印张长度(单位cm)
*/
private Double sheetLength;
/**
* 印张宽度(单位cm)
*/
private Double sheetWidth;
/**
* 产品印张设置(product_sheet_conf)
*/
private String productSheetConf;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingMakeQueryRequest.java 0 → 100644
View file @ 2ccc6714
package com.huigou.topsun.proofing.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
* 打样制作单表
* @TableName proofing_make
*/
@Data
public class ProofingMakeQueryRequest extends QueryAbstractRequest {
/**
* 制作单id
*/
private String proofingMakeId;
/**
* 制作单号
*/
private String proofingMakeNo;
/**
* 打样申请单id
*/
private String proofingApplyId;
/**
* 申请单号
*/
private String applicationNo;
/**
* 颜色种类
*/
private String colorType;
/**
* 专
*/
private String expert;
/**
* 网版目数
*/
private Integer printingPlateNum;
/**
* 啤板模数
*/
private Integer beerPlateNum;
/**
* 模切板模数
*/
private Integer dieBoardNum;
/**
* 预定工序流程id
*/
private String plannedFlowId;
/**
* 文件存储位置
*/
private String fileStorageLocation;
/**
* 样品物料
*/
private String sampleMaterial;
/**
* 样品制作单状态：create-新建；unauditede-未审核；audited-已审核
*/
private String makeStatus;
/**
* 是否确认：Y-是，N-否；
*/
private String isConfirm;
/**
* 样品款式
*/
private String sampleStyle;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/BomVo.java deleted 100644 → 0
View file @ 7ffd0f2e
package com.huigou.topsun.proofing.domain.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
/**
* 物料清单
*/
@Data
public class BomVo implements Serializable {
/**
* 物料组成id
*/
private Long id;
/**
* 物料名称
*/
private String materialName;
/**
* 物料数量
*/
private Integer materialNumber;
/**
* 产品id
*/
private Long productId;
/**
* 产品
*/
private String productName;
}
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.domain.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
/**
......@@ -42,6 +38,7 @@ public class ProofingMakeVo{
/**
* 申请单号
*/
......
topsun/src/main/java/com/huigou/topsun/proofing/mapper/ProofingApplyMapper.java deleted 100644 → 0
View file @ 7ffd0f2e
package com.huigou.topsun.proofing.mapper;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import com.topsunit.query.annotations.Mapper;
import java.util.Map;
/**
* @author yonghuan
*/
@Mapper(xml = "config/topsun/proofing/proofingApply.xml")
public interface ProofingApplyMapper {
Map<String, Object> slicedQuery(ProofingApplyQuery query);
// ProofingApplyAndProductVo queryProofingApplyAndProduct();
}
topsun/src/main/java/com/huigou/topsun/proofing/repository/ProofingApplyRepository.java
View file @ 2ccc6714
package com.huigou.topsun.proofing.repository;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndProductVo;
import com.topsunit.query.annotations.Param;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
public interface ProofingApplyRepository extends JpaRepository<ProofingApply, String> {
......@@ -9,4 +12,5 @@ public interface ProofingApplyRepository extends JpaRepository<ProofingApply, St
ProofingApply findByProofingApplyNo(String proofingApplyNo);
}
topsun/src/main/java/com/huigou/topsun/proofing/service/ProofingMakeService.java deleted 100644 → 0
View file @ 7ffd0f2e
package com.huigou.topsun.proofing.service;
import com.huigou.topsun.proofing.domain.model.ProofingMake;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import java.util.List;
public interface ProofingMakeService {
/**
* 根据id查询打样制造详情信息
* @return
*/
// List<ProofingMakeVo> getProofingMakeVoListById(Long id);
List<ProofingMakeVo> getProofingMakeVoList();
ProofingMakeVo getProofingMakeVoById(String proofingMakeId);
/**
*编辑打样制造信息（或添加或修改打样制造与之相关的表）
* @param proofingMake
*/
void saveProofingMakeVo(ProofingMake proofingMake);
void deleteProofingMakeVo(String proofingMakeId);
}
topsun/src/main/java/com/huigou/topsun/technology/application/TechnologyApplication.java
View file @ 2ccc6714
......@@ -27,7 +27,6 @@ public interface TechnologyApplication {
TechnologyVo findTechnologyByTechnologyIdId(String technologyId);
List<Technology> findAllByProductId(String productId);
Map<String, Object> queryTechnologyByProduct(TechnologyQueryRequest queryRequest);
}
topsun/src/main/java/com/huigou/topsun/technology/application/impl/TechnologyApplicationImpl.java
View file @ 2ccc6714
......@@ -72,10 +72,6 @@ public class TechnologyApplicationImpl extends BaseApplication implements Techno
return TechnologyVo.getTechnologyVo(technology);
}
@Override
public List<Technology> findAllByProductId(String productId) {
return technologyRepository.findAllByProductId(productId);
}
@Override
public Map<String, Object> queryTechnologyByProduct(TechnologyQueryRequest queryRequest) {
......
topsun/src/main/resources/config/topsun/mapper/proofing/BomMapper.xml deleted 100644 → 0
View file @ 7ffd0f2e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.huigou.topsun.proofing.mapper.BomMapper">
<resultMap id="BomVoResultMap" type="com.huigou.topsun.proofing.domain.vo.BomVo">
<id property="id" column="product_material_id" jdbcType="BIGINT"/>
<result property="materialNumber" column="material_number" jdbcType="BIGINT"/>
<result property="productId" column="product_id" jdbcType="BIGINT"/>
<!-- <result property="resourceFiledTitle" column="resource_filed_title" jdbcType="VARCHAR"/>-->
<!-- <result property="resourceFieldType" column="resource_field_type" jdbcType="VARCHAR"/>-->
<!-- <result property="resourceFieldShow" column="resource_field_show" jdbcType="VARCHAR"/>-->
</resultMap>
<sql id="select_BomVo">
select pm.product_material_id,pm.material_number,p.product_id
from product p
inner join product_material pm
on(p.product_id=pm.product_id)
</sql>
<select id='getBomVoListByProductId' resultMap="BomVoResultMap">
<include refid="select_BomVo"/>
where p.product_id=#{productId}
</select>
<select id="getBomVoById" resultType="com.huigou.topsun.proofing.domain.vo.BomVo">
<include refid="select_BomVo"/>
where p.product_id=#{productId}
</select>
</mapper>
topsun/src/main/resources/config/topsun/proofing/proofingApply.xml
View file @ 2ccc6714
......@@ -11,4 +11,73 @@
</permissions>
</query>
<query name="queryProofingApplyAndProductQuery" table="proofing_apply">
<sql-query>
select
pa.proofing_apply_id,
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
pa.proofing_apply_page_need_time,
pa.proofing_apply_complete_date,
pa.proofing_apply_sample_cn_name,
pa.proofing_apply_sample_en_name,
pa.proofing_apply_sample_version,
pa.proofing_apply_sample_size,
pa.proofing_apply_sample_num,
pa.proofing_apply_output_situation,
pa.proofing_apply_product_no,
pa.proofing_type,
pa.proofing_apply_allocation_type,
pa.proofing_apply_surface_treatment,
pa.proofing_apply_ng_re_reason,
pa.proofing_apply_application_status,
pa.proofing_apply_test_standard,
pa.is_output,
pa.is_out,
pa.is_change,
pl.product_looked_id,
pl.product_length,
pl.product_width,
pl.product_height,
pl.product_thick,
pl.product_weight,
pl.product_angle_type,
pl.product_angle,
pl.product_aperture,
pl.product_single_layer,
pl.product_single_weight,
pl.product_layer_num,
pl.product_mould,
pl.product_coding,
pl.product_sys_certification,
pl.store_name,
pl.product_buy_unit,
pl.product_shape,
pl.prodcut_shape_size,
p.product_name,
p.product_status,
p.product_unit,
p.product_sample_code,
p.brand_name,
p.product_type,
pc.product_category_name
FROM
proofing_apply pa
JOIN
product_looked pl ON pa.product_id = pl.product_id
JOIN
product p ON pa.product_id = p.product_id
JOIN
product_category pc ON p.product_category_id = pc.product_category_id
where pa.id=?
</sql-query>
</query>
</query-mappings>
\ No newline at end of file
topsun/src/main/resources/config/topsun/proofing/proofingMake.xml 0 → 100644
View file @ 2ccc6714
<?xml version="1.0" encoding="UTF-8"?>
<query-mappings>
<query name="slicedProofingMakeList" table="proofing_apply">
<sql-query>
SELECT
pm.*,
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
pa.proofing_apply_page_need_time,
pa.proofing_apply_complete_date,
pa.proofing_apply_sample_cn_name,
pa.proofing_apply_sample_en_name,
pa.proofing_apply_sample_version,
pa.proofing_apply_sample_size,
pa.proofing_apply_sample_num,
pa.proofing_apply_output_situation,
pa.proofing_apply_product_no,
pa.proofing_type,
pa.proofing_apply_allocation_type,
pa.proofing_apply_surface_treatment,
pa.proofing_apply_ng_re_reason,
pa.proofing_apply_application_status,
pa.proofing_apply_test_standard,
pa.is_output,
pa.is_out,
pa.is_change
FROM
proofing_make pm
JOIN
proofing_apply pa ON pm.proofing_apply_id = pa.proofing_apply_id
</sql-query>
</query>
</query-mappings>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment