Commit 23914e8a authored by wanghang's avatar wanghang

冲突

parent cc10a62a
...@@ -6,12 +6,12 @@ $(document).ready(function () { ...@@ -6,12 +6,12 @@ $(document).ready(function () {
}); });
function initialize(){ function initialize(){
$("#proofingApplyNgReReason").prop("placeholder","录入此列本单作废");
//若是作为详情页,则初始化bom //若是作为详情页,则初始化bom
if($("#productId").val()!=null&&$("#productId").val()!=""){ if($("#productId").val()!=null&&$("#productId").val()!=""){
showTable({proofingApplyId:$("#proofingApplyId").val()}); showTable({proofingApplyId:$("#proofingApplyId").val()});
} }
} }
//绑定selectC //绑定selectC
function bindQueryEvent() { function bindQueryEvent() {
$('#productCode').searchbox({ $('#productCode').searchbox({
......
...@@ -6,6 +6,7 @@ $(document).ready(function () { ...@@ -6,6 +6,7 @@ $(document).ready(function () {
function initialize() { function initialize() {
$("#proofingApplyNgReReason").prop("placeholder","录入此列本单作废");
/** /**
* 如果是详情页,展示数据,隐藏按钮 * 如果是详情页,展示数据,隐藏按钮
* @type {boolean} * @type {boolean}
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
fieldCol="2"/> fieldCol="2"/>
<x:selectC name="proofingMakeStatus" label="样品制造单状态" dictionary="handleResult" labelCol="1" <x:selectC name="proofingMakeStatus" label="样品制造单状态" dictionary="handleResult" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
<x:inputC name="isConfirm" label="是否确认" maxLength="32" labelCol="1" <x:selectC name="isConfirm" label="是否确认" dictionary="yesorno" labelCol="1"
fieldCol="2"/> fieldCol="2"/>
</div> </div>
</div> </div>
......
...@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -125,7 +126,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -125,7 +126,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
proofingApplyProcess.setProofingApplyProcessId(null); proofingApplyProcess.setProofingApplyProcessId(null);
proofingApplyProcess.setProofingApplyTechnologyId(proofingTechnology.getProofingApplyTechnologyId()); proofingApplyProcess.setProofingApplyTechnologyId(proofingTechnology.getProofingApplyTechnologyId());
proofingApplyProcessRepository.saveAndFlush(proofingApplyProcess); proofingApplyProcessRepository.saveAndFlush(proofingApplyProcess);
} }
for (ProofingApplyProcessMaterial proofingApplyProcessMaterial : processMaterialList) { for (ProofingApplyProcessMaterial proofingApplyProcessMaterial : processMaterialList) {
...@@ -181,7 +181,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing ...@@ -181,7 +181,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(Long.valueOf(proofingApplyAndLookedVo.getProductId())); ProductPublishedConf productPublishedConf = productPublishedConfRepository.findByProductId(new BigDecimal(proofingApplyAndLookedVo.getProductId()));
if(productPublishedConf!=null){ if(productPublishedConf!=null){
BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo); BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo);
} }
......
...@@ -134,16 +134,19 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo ...@@ -134,16 +134,19 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
proofingMakeProcessMaterialRepository.save(proofingMakeProcessMaterial); proofingMakeProcessMaterialRepository.save(proofingMakeProcessMaterial);
} }
String productId = proofingMakeBaseInfo.getProductId();
//编辑产品信息 //编辑产品信息
ProductLooked productLooked = sdo.toObject(ProductLooked.class); ProductLooked productLooked = sdo.toObject(ProductLooked.class);
productLooked.setProductId(productId);
ProductPublishedConf productPublishedConf = sdo.toObject(ProductPublishedConf.class); ProductPublishedConf productPublishedConf = sdo.toObject(ProductPublishedConf.class);
productPublishedConf.setProductId(productId);
ProductLooked looked = productLookedRepository.findByProductId(productLooked.getProductId()); ProductLooked looked = productLookedRepository.findByProductId(productLooked.getProductId());
productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId().toString()); productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId().toString());
productLookedRepository.save(productLooked); productLookedRepository.save(productLooked);
ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId().longValue());
ProductPublishedConf publishedConf = productPublishedConfRepository.findByProductId(productPublishedConf.getProductId());
productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId().toString()); productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId().toString());
productPublishedConfRepository.save(productPublishedConf); productPublishedConfRepository.save(productPublishedConf);
return idMap; return idMap;
} }
......
...@@ -35,9 +35,9 @@ public class ProofingApplyAndLookedVo { ...@@ -35,9 +35,9 @@ public class ProofingApplyAndLookedVo {
private String customerCode; private String customerCode;
/** // /**
* 品牌编号名称 // * 品牌编号名称
*/ // */
// private String productCategoryName; // private String productCategoryName;
/** /**
......
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