Merge branch 'master_huangjunjie' of http://121.40.253.172:3000/pengyue/jsh_erp

# Conflicts:
#	src/main/java/com/jsh/erp/service/DepotHeadService.java
#	src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

src/main/java/com/jsh/erp/service/DepotHeadService.java

@@ -183,4 +183,10 @@ public interface DepotHeadService extends IService<DepotHead> {
 
     String syncOrderToXsdd(DepotHeadXsddRequestVO depotHead, List<DepotItemXsddRequestVO> depotItemList) throws Exception;
 
+    /**
+     * 根据商品id查询最后一条商品订单
+     * @param mid 商品ID
+     * @return
+     */
+    DepotHead getDepotLastByMaterialId(long mid);
 }

src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -1832,4 +1832,15 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
         logService.insertLog("销售订单", new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(depotHead.getNumber()).toString(), ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest());
         return "";
     }
+
+    /**
+     * 根据商品id获取最后一条销售订单
+     * @param mid 商品id
+     * @return 商品信息
+     */
+    @Override
+    public DepotHead getDepotLastByMaterialId(long mid) {
+        return depotHeadMapper.getDepotLastByMaterialId(mid);
+    }
+
 }