Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -58,8 +58,6 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     @Override
     public void updateLatestPurchasePrice(Long pu_id) {
         getMapper().updateLatestPurchasePrice(pu_id);
-        Product product = getMapper().selectByPrimaryKey(pu_id);
-        messageLogService.update(generateMsgObj(pu_id, product.getPr_code()));
     }
 
     @Override

applications/sale/sale-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -96,7 +96,7 @@
           and  companyId = #{companyId}
         </if>
       </where>
-      order by pi_id
+      order by pi_id desc
   </select>
 
 </mapper>

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -60,7 +60,7 @@
             <if test="companyId != null">
                 and   sale.companyId = #{companyId}
             </if>
-        </where>  order by sd_detno
+        </where>  order by sd_detno desc
     </select>
 
     <select id="selectPurchaseBycondition" resultMap="BaseResultMap">
@@ -73,7 +73,7 @@
                 and  companyId = #{companyId}
             </if>
         </where>
-        order by sa_id
+        order by sa_id desc
     </select>
 
 </mapper>