Browse Source

锡膏修改

callm 5 years ago
parent
commit
656008c5aa

+ 1 - 1
WebContent/app/view/scm/product/MSDProduct/MsdInfo.js

@@ -7,7 +7,7 @@ Ext.define('erp.view.scm.product.MSDProduct.MsdInfo',{
 			items: [{
 				xtype: 'msdInfoGridGrid',
 				anchor: '100% 100%',
-				keyField: 'ac_id'
+				keyField: 'ml_id'
 			}]
 		}); 
 		me.callParent(arguments); 

+ 1 - 1
src/com/uas/mes/pda/service/impl/PdaSpmServiceImpl.java

@@ -149,7 +149,7 @@ public  class PdaSpmServiceImpl implements PdaSpmService {
             if(restoreCount > 0){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+",只允许回存一次,不允许多次回存!");
             }
-            if (spb_status.equals("已开封") && rewarmingTime >= 19){
+            if (spb_status.equals("已开封") && rewarmingTime >= 24){
                 throw new APIErrorException(APIErrorCode.BUSINESS_FAILED,"条码"+barcode+",当前已回温: "+rewarmingTime+" 小时,开封状态下回温时长超过19小时,不允许回存!");
             }
             if(spb_status.equals("出库回温") && rewarmingTime >= 24){