Преглед изворни кода

修改采购单转单限制

zhoudw пре 7 година
родитељ
комит
895383d454

+ 1 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -407,7 +407,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //检查转单状态
         String acceptstatus = purchase.getPu_acceptstatuscode();
 
-        if ("CLOSED".equals(acceptstatus)){
+        if (Status.CLOSE.name().equals(acceptstatus)){
             return Result.error(ExceptionCode.CLOSED_EXIST);
         }
         List<PurchaseDetail> purchaseDetails = purchasedetailMapper.selectByFK(id);

+ 1 - 1
frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         emptyText : '仓库编号'
     },{
         width: 200,
-        name: 'wh_name',
+        name: 'wh_description',
         xtype: 'textfield',
         emptyText : '仓库名称'
     },{