zhangyuewww 3 years ago
parent
commit
24e5d31e3f

+ 2 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -391,7 +391,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         boolean one=this.insert(weighingManagement);
         //成功返回ok
         if (one &&two ) {
-            return "OK";
+            return weighingManagement.getId();
         } else {
             return "NG";
         }
@@ -414,7 +414,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         boolean two = qualityInspectionManagementService.updateById(weighingManagement.getQualityInspectionManagement());
         //成功返回ok
         if (one &&two ) {
-            return "OK";
+            return weighingManagement.getId();
         } else {
             return "NG";
         }

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -118,7 +118,7 @@
                 AND a.status_flag='5'
             </if>
         </if>
-        ORDER BY a.number DESC
+        ORDER BY a.gross_date DESC,a.tare_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>