Przeglądaj źródła

求购验收结果处理

liusw 8 lat temu
rodzic
commit
66cfda54e3

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/dao/GoodsDao.java

@@ -676,6 +676,6 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param brand
      * @return
      */
-    @Query(value = "select g from Goods g where g.code = :code and (g.brandNameCn = :brand or g.brandNameEn = :brand) and status = 601")
+    @Query(value = "select g from Goods g where g.code = :code and (g.brandNameCn = :brand or g.brandNameEn = :brand) and status = 601 order by currencyName asc")
     List<Goods> getGoodsByCodeAndName(@Param("code")String code, @Param("brand")String brand);
 }

+ 1 - 3
src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -82,7 +82,6 @@ define(['app/app'], function (app) {
           }
 
           $scope.onMinDayInput = function () {
-            // $scope.offer.minDay = Number($scope.offer.minDay.toString());
             if ($scope.offer.minDay < 1 || $scope.offer.minDay > 31 || $scope.offer.minDay.toString().indexOf('.') !== -1) {
               $scope.validOffer.minDay = false;
               toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
@@ -101,7 +100,6 @@ define(['app/app'], function (app) {
           }
 
           $scope.onMaxDayInput = function () {
-            // $scope.offer.maxDay = Number($scope.offer.maxDay.toString());
             if ($scope.offer.maxDay < 1 || $scope.offer.maxDay > 31 || $scope.offer.maxDay.toString().indexOf('.') !== -1) {
               $scope.validOffer.maxDay = false;
               toaster.pop('warning', '提示', '交期只能填写1-31之间的整数值');
@@ -157,7 +155,7 @@ define(['app/app'], function (app) {
               });
             } else {
               if (!$scope.validOffer.unitPrice) {
-                if (!$scope.offer.unitPrice || $scope.offer.unitPrice == 0) {
+                if (!$scope.offer.unitPrice) {
                   toaster.pop('warning', '提示', '单价不能为空');
                 } else {
                   toaster.pop('warning', '提示', '单价必须是大于0的数字');