diff --git a/oms_web/oms_vue/src/api/system/user.js b/oms_web/oms_vue/src/api/system/user.js
index 290eaf2c..fcfcdd23 100644
--- a/oms_web/oms_vue/src/api/system/user.js
+++ b/oms_web/oms_vue/src/api/system/user.js
@@ -106,7 +106,7 @@ export function updateUserPwd(oldPassword, newPassword) {
 // 用户头像上传
 export function uploadAvatar(data) {
   return request({
-    url: '/system/user/profile/avatar',
+    url: '/system/user/profile/updateAvatar',
     method: 'post',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: data
diff --git a/oms_web/oms_vue/src/assets/images/profile.png b/oms_web/oms_vue/src/assets/images/profile.png
new file mode 100644
index 00000000..56247443
Binary files /dev/null and b/oms_web/oms_vue/src/assets/images/profile.png differ
diff --git a/oms_web/oms_vue/src/assets/images/profile.jpg b/oms_web/oms_vue/src/assets/images/profile1.jpg
similarity index 100%
rename from oms_web/oms_vue/src/assets/images/profile.jpg
rename to oms_web/oms_vue/src/assets/images/profile1.jpg
diff --git a/oms_web/oms_vue/src/store/modules/user.js b/oms_web/oms_vue/src/store/modules/user.js
index 5020a981..71852f98 100644
--- a/oms_web/oms_vue/src/store/modules/user.js
+++ b/oms_web/oms_vue/src/store/modules/user.js
@@ -2,7 +2,7 @@ import router from '@/router'
 import { MessageBox, } from 'element-ui'
 import { login, logout, getInfo } from '@/api/login'
 import { isHttp, isEmpty } from "@/utils/validate"
-import defAva from '@/assets/images/profile.jpg'
+import defAva from '@/assets/images/profile.png'
 
 const user = {
   state: {
@@ -66,7 +66,7 @@ const user = {
           // 后端返回的数据在 res.data 中
           const data = res.data || res
           const user = data.user
-          let avatar = user.avatar || ""
+          let avatar = user.avatar? '/common/download/resource?resource='+encodeURIComponent(user.avatar) : ""
           if (!isHttp(avatar)) {
             avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
           }
diff --git a/oms_web/oms_vue/src/views/inventory/stock/index.vue b/oms_web/oms_vue/src/views/inventory/stock/index.vue
index ad2af57e..514cb45b 100644
--- a/oms_web/oms_vue/src/views/inventory/stock/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/stock/index.vue
@@ -73,6 +73,11 @@
           <span>{{ scope.row.stockStatus === '0' ? '待备货' : '已备货' }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否曾经备货" align="center" prop="stockStatus" width="100">
+        <template slot-scope="scope">
+          <span :style="{'color': scope.row.onceInStock==='1' ? 'red' : ''}">{{ (scope.row.onceInStock||'0') === '0' ? '未备货' : '曾经备货' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="数量" align="center" prop="allQuantity" width="100" />
       <el-table-column label="备货地址" align="center" prop="notifierAddress" width="300" show-overflow-tooltip />
       <el-table-column label="联系人" align="center" prop="notifier" width="100" />
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsStockInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsStockInfo.java
index ea6ee226..b783f7ea 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsStockInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsStockInfo.java
@@ -23,6 +23,7 @@ public class OmsStockInfo {
      * 备货状态 0:未备货  1:已备货
      */
     private String stockStatus;
+    private String onceInStock;
     /**
      * 创建时间
      */
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsStockInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsStockInfoServiceImpl.java
index dbb3fdbd..ba673879 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsStockInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsStockInfoServiceImpl.java
@@ -40,6 +40,10 @@ public class OmsStockInfoServiceImpl implements IOmsStockInfoService {
 
     @Override
     public int insert(OmsStockInfo omsStockInfo) {
+        //需要验证数据
+        List<OmsStockInfo> omsStockInfos = omsStockInfoMapper.queryAll(omsStockInfo);
+        boolean b = omsStockInfos.stream().anyMatch(item -> "1".equalsIgnoreCase(item.getStockStatus()));
+        omsStockInfo.setOnceInStock(b ? "1" : "0");
         return omsStockInfoMapper.insert(omsStockInfo);
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 607218c3..cc0343d2 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -124,7 +124,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     private static final List<String> REJECT_EMAIL_LIST = Arrays.asList("li.junjie@unisinsight.com",  "chen.shenggang@unisinsight.com");
 
     @Autowired
-    private OmsStockInfoMapper omsStockInfoMapper;
+    private IOmsStockInfoService omsStockInfoService;
     @Autowired
     private IProjectTaxRateTempService projectTaxRateTempService;
     @Value("${unis.order.endHour:96}")
@@ -1218,7 +1218,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     private void addStock(String businessKey) {
         OmsStockInfo omsStockInfo = new OmsStockInfo();
         omsStockInfo.setOrderCode(businessKey);
-        omsStockInfoMapper.insert(omsStockInfo);
+        omsStockInfoService.insert(omsStockInfo);
     }
 
 //    @Override
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsStockInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsStockInfoMapper.xml
index 2a903daa..ec3c5481 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/OmsStockInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsStockInfoMapper.xml
@@ -98,6 +98,9 @@
             <if test="stockStatus != null and stockStatus != ''">
                 stock_status,
             </if>
+            <if test="onceInStock != null and onceInStock != ''">
+                once_in_stock,
+            </if>
             <if test="createTime != null">
                 create_time,
             </if>
@@ -109,6 +112,9 @@
             <if test="stockStatus != null and stockStatus != ''">
                 #{stockStatus},
             </if>
+            <if test="onceInStock != null and onceInStock != ''">
+                #{onceInStock},
+            </if>
             <if test="createTime != null">
                 #{createTime},
             </if>