冲突

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js

@@ -6,12 +6,12 @@ $(document).ready(function () {
 });
 
 function initialize(){
+    $("#proofingApplyNgReReason").prop("placeholder","录入此列本单作废");
     //若是作为详情页，则初始化bom
     if($("#productId").val()!=null&&$("#productId").val()!=""){
         showTable({proofingApplyId:$("#proofingApplyId").val()});
     }
 }
-
 //绑定selectC
 function bindQueryEvent() {
     $('#productCode').searchbox({

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp

@@ -60,7 +60,7 @@
 
                 <x:inputC name="proofingApplySurfaceTreatment" label="表面处理" maxLength="32" labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="proofingApplyNgReReason" label="NG重新打样原因" maxLength="32" labelCol="1"
+                <x:inputC name="proofingApplyNgReReason" label="NG重新打样原因"  maxLength="32" labelCol="1"
                           fieldCol="2"/>
                 <x:inputC name="proofingApplyTestStandard" label="测试标准" maxLength="32" labelCol="1" fieldCol="2"/>
                 <x:selectC name="proofingApplyApplicationStatus" label="申请单状态" dictionary="handleResult" labelCol="1" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
 
 
 function initialize() {
+    $("#proofingApplyNgReReason").prop("placeholder","录入此列本单作废");
     /**
      * 如果是详情页，展示数据，隐藏按钮
      * @type {boolean}

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp

@@ -129,7 +129,7 @@
                           fieldCol="2"/>
                 <x:selectC name="proofingMakeStatus"  label="样品制造单状态" dictionary="handleResult"  labelCol="1"
                           fieldCol="2"/>
-                <x:inputC name="isConfirm"  label="是否确认" maxLength="32" labelCol="1"
+                <x:selectC name="isConfirm"  label="是否确认" dictionary="yesorno" labelCol="1"
                           fieldCol="2"/>
             </div>
         </div>

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyApplicationImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -125,7 +126,6 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
             proofingApplyProcess.setProofingApplyProcessId(null);
             proofingApplyProcess.setProofingApplyTechnologyId(proofingTechnology.getProofingApplyTechnologyId());
             proofingApplyProcessRepository.saveAndFlush(proofingApplyProcess);
-
         }
 
         for (ProofingApplyProcessMaterial proofingApplyProcessMaterial : processMaterialList) {
@@ -181,7 +181,7 @@ public class ProofingApplyApplicationImpl extends FlowBroker implements Proofing
     public ProofingApplyAndLookedVo getProofingApplyByProofingApplyNo(String proofingApplyNo) {
         QueryDescriptor queryDescriptor =  this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryProofingApplyAndProductQuery");
         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){
             BeanUtils.copyProperties(productPublishedConf,proofingApplyAndLookedVo);
       }

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java

@@ -134,16 +134,19 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
             proofingMakeProcessMaterialRepository.save(proofingMakeProcessMaterial);
         }
 
+        String productId = proofingMakeBaseInfo.getProductId();
         //编辑产品信息
         ProductLooked productLooked = sdo.toObject(ProductLooked.class);
+        productLooked.setProductId(productId);
         ProductPublishedConf productPublishedConf = sdo.toObject(ProductPublishedConf.class);
+        productPublishedConf.setProductId(productId);
         ProductLooked looked = productLookedRepository.findByProductId(productLooked.getProductId());
         productLooked.setProductLookedId(looked==null?null:looked.getProductLookedId().toString());
         productLookedRepository.save(productLooked);
-        ProductPublishedConf publishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(productPublishedConf.getProductId().longValue());
+
+        ProductPublishedConf publishedConf = productPublishedConfRepository.findByProductId(productPublishedConf.getProductId());
         productPublishedConf.setProductPublishedConfId(publishedConf==null?null:publishedConf.getProductPublishedConfId().toString());
         productPublishedConfRepository.save(productPublishedConf);
-
         return idMap;
     }
 

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingApplyAndLookedVo.java

@@ -35,9 +35,9 @@ public class ProofingApplyAndLookedVo {
 
     private String customerCode;
 
-    /**
-     * 品牌编号名称
-     */
+//    /**
+//     * 品牌编号名称
+//     */
 //    private String productCategoryName;
 
     /**