Skip to content

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

修复已知问题

parent 55cda941
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 25 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp
View file @ cd061dfd
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
labelCol="1" fieldCol="2"/> labelCol="1" fieldCol="2"/>
<x:inputC name="proofingMakeNgReReason" label="NG重新打样原因" maxLength="32" <x:inputC name="proofingMakeNgReReason" label="NG重新打样原因" maxLength="32"
labelCol="1" fieldCol="2"/> labelCol="1" fieldCol="2"/>
<x:inputC name="a" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/> <x:inputC name="proofingMakeTestStandard" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
<x:selectC name="proofingMakeTestStandard" dictionary="handleResult" label="申请单状态" <x:selectC name="proofingApplyApplicationStatus" dictionary="handleResult" label="申请单状态"
labelCol="1" fieldCol="2"/> labelCol="1" fieldCol="2"/>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
fieldCol="2"/> fieldCol="2"/>
<x:selectC name="isChange" label="是否改变" dictionary="yesorno" labelCol="1" <x:selectC name="isChange" label="是否改变" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="plasticBagType" label="塑料袋结构类型" maxLength="32" labelCol="1" <x:inputC name="plasticBagStructure" label="塑料袋结构类型" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLength" label="长度（cm）" maxLength="32" labelCol="1" <x:inputC name="productLength" label="长度（cm）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
...@@ -101,25 +101,25 @@ ...@@ -101,25 +101,25 @@
<x:inputC name="productLayerNum" label="层数" maxLength="32" labelCol="1" <x:inputC name="productLayerNum" label="层数" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="样品形状" maxLength="32" labelCol="1" <x:inputC name="sampleShape" label="样品形状" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="prodcutShapeSize" label="样品形状大小（mm）" maxLength="32" labelCol="1" <x:inputC name="sampleShapeSize" label="样品形状大小（mm）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="预定工艺流程id" maxLength="32" labelCol="1" <x:inputC name="plannedFlowId" label="预定工艺流程id" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="文件存储位置" maxLength="32" labelCol="1" <x:inputC name="fileStorageLocation" label="文件存储位置" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="样品物料" maxLength="32" labelCol="1" <x:inputC name="sampleMaterial" label="样品物料" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productAperture" label="孔径（mm）" maxLength="32" labelCol="1" <x:inputC name="productAperture" label="孔径（mm）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="成品克重（g）" maxLength="32" labelCol="1" <x:inputC name="productWeight" label="成品克重（g）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productSingleWeight" label="单重（kg）" maxLength="32" labelCol="1" <x:inputC name="productSingleWeight" label="单重（kg）" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="样品制造单状态" maxLength="32" labelCol="1" <x:selectC name="proofingMakeStatus" label="样品制造单状态" dictionary="handleResult" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="是否确认" maxLength="32" labelCol="1" <x:inputC name="isConfirm" label="是否确认" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
</div> </div>
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="sheetWidth" label="印张宽度(mm)" maxLength="32" labelCol="1" <x:inputC name="sheetWidth" label="印张宽度(mm)" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="印刷正面颜色" maxLength="32" labelCol="1" <x:inputC name="printFrontColer" label="印刷正面颜色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productLayerNum" label="印刷反面颜色" maxLength="32" labelCol="1" <x:inputC name="printOppositeColor" label="印刷反面颜色" maxLength="32" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
</div> </div>
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ cd061dfd
...@@ -18,10 +18,10 @@ var technologyObj={ ...@@ -18,10 +18,10 @@ var technologyObj={
gridManager:null, gridManager:null,
columns:[ columns:[
{display: "工艺路线名称", name: "technologyName", width: 140, minWidth: 60, type: "string", align: "left", {display: "工艺路线名称", name: "technologyName", width: 140, minWidth: 60, type: "string", align: "left",
// editor: { editor: {
// type: 'text', type: 'text',
// required: true required: true
// } }
} }
] ]
} }
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApply.jsp
View file @ cd061dfd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="proofingApplySampleEnName" label="采购单位" maxLength="32" labelCol="2" <x:inputC name="proofingApplySampleEnName" label="采购单位" maxLength="32" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="proofingApplySampleVersion" label="换算值" maxLength="32" labelCol="2" <x:inputC name="matrixingValue" label="换算值" maxLength="32" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="productName" label="产品名称" maxLength="32" labelCol="2" <x:inputC name="productName" label="产品名称" maxLength="32" labelCol="2"
fieldCol="2"/> fieldCol="2"/>
......
topsun/src/main/java/com/huigou/topsun/product/repository/ProductPublishedConfRepository.java
View file @ cd061dfd
...@@ -11,5 +11,5 @@ import org.springframework.data.jpa.repository.JpaRepository; ...@@ -11,5 +11,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
public interface ProductPublishedConfRepository extends JpaRepository<ProductPublishedConf,String> { public interface ProductPublishedConfRepository extends JpaRepository<ProductPublishedConf,String> {
ProductPublishedConf findByProductId(Long productId); ProductPublishedConf findByProductId(Long productId);
ProductPublishedConf getProductPublishedConfByProductId(String productId); ProductPublishedConf getProductPublishedConfByProductId(Long productId);
} }
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java
View file @ cd061dfd
...@@ -67,7 +67,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -67,7 +67,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
} }
@SneakyThrows @SneakyThrows
@Transactional(propagation = Propagation.NOT_SUPPORTED) @Transactional(propagation = Propagation.REQUIRES_NEW)
@Override @Override
protected String saveBizAndApprovalData() { protected String saveBizAndApprovalData() {
super.saveBizAndApprovalData(); super.saveBizAndApprovalData();
...@@ -91,9 +91,14 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -91,9 +91,14 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
if (proofingApply.getProofingApplyId() == null || proofingApply.getProofingApplyId().isEmpty()) { if (proofingApply.getProofingApplyId() == null || proofingApply.getProofingApplyId().isEmpty()) {
proofingApply.setProofingApplyId(id); proofingApply.setProofingApplyId(id);
} }
//如果录入了ng重新打样原因，则更改状态为不通过
if(!StringUtil.isBlank(proofingApply.getProofingApplyNgReReason())){
proofingApply.setProofingApplyApplicationStatus("2");
}
proofingApply = proofingApplyRepository.save(proofingApply); proofingApply = proofingApplyRepository.save(proofingApply);
ProofingApplyLooked looked = proofingApplyLookedRepository.findByProofingApplyId(proofingApply.getProofingApplyId()); ProofingApplyLooked looked = proofingApplyLookedRepository.findByProofingApplyId(proofingApply.getProofingApplyId());
proofingApplyLooked.setProofingApplyLookedId(looked != null ? looked.getProofingApplyLookedId() : null); proofingApplyLooked.setProofingApplyLookedId(looked != null ? looked.getProofingApplyLookedId() : null);
proofingApplyLooked.setProofingApplyId(proofingApply.getProofingApplyId()); proofingApplyLooked.setProofingApplyId(proofingApply.getProofingApplyId());
...@@ -168,7 +173,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -168,7 +173,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) { public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryProofingApplyAndProductQuery"); QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryProofingApplyAndProductQuery");
ProofingApplyAndLookedVo proofingApplyAndLookedVo = this.sqlExecutorDao.queryToObject(queryDescriptor.getSql(), ProofingApplyAndLookedVo.class, proofingApplyNo); ProofingApplyAndLookedVo proofingApplyAndLookedVo = this.sqlExecutorDao.queryToObject(queryDescriptor.getSql(), ProofingApplyAndLookedVo.class, proofingApplyNo);
ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApplyAndLookedVo.getProductId()); ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(Long.valueOf(proofingApplyAndLookedVo.getProductId()));
if(productPublishedConf!=null){ if(productPublishedConf!=null){
BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo); BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo);
} }
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/model/proofingMake/ProofingMakeBaseInfo.java
View file @ cd061dfd
...@@ -146,8 +146,8 @@ public class ProofingMakeBaseInfo implements Serializable { ...@@ -146,8 +146,8 @@ public class ProofingMakeBaseInfo implements Serializable {
/** /**
* 申请单状态 * 申请单状态
*/ */
@Column(name = "proofing_make_application_status") @Column(name = "proofing_apply_application_status")
private String proofingMakeApplicationStatus; private String proofingApplyApplicationStatus;
/** /**
* 测试标准 * 测试标准
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingApplyBaseInfoVo.java
View file @ cd061dfd
...@@ -94,7 +94,6 @@ public class ProofingApplyBaseInfoVo extends FlowBillAbstractEntity { ...@@ -94,7 +94,6 @@ public class ProofingApplyBaseInfoVo extends FlowBillAbstractEntity {
/** /**
* 样品数量 * 样品数量
*/ */
private Long proofingApplySampleNum; private Long proofingApplySampleNum;
/** /**
......
topsun/src/main/resources/config/content/easysearch/easy-search-proofing.xml
View file @ cd061dfd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code
from proofing_apply_base_info pa from proofing_apply_base_info pa
inner join product p on(pa.product_id=p.product_id) inner join product p on(pa.product_id=p.product_id)
<!-- where pa.proofing_apply_application_status ='normal'--> where pa.proofing_apply_application_status != 2
</sql> </sql>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" /> <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="申请Id" title="申请Id" code="proofingApplyId" width="200" /> <field name="申请Id" title="申请Id" code="proofingApplyId" width="200" />
......
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