提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/prodInventory/controller/ProdInventoryController.java

@@ -7,6 +7,7 @@ import com.xingxi.common.core.controller.BaseController;
 import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.enums.BusinessType;
+import com.xingxi.common.utils.ShiroUtils;
 import com.xingxi.web.controller.business.prodInventory.domain.ProdInventoryVo;
 import com.xingxi.web.controller.business.prodInventory.service.IProdInventoryVoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -47,6 +48,9 @@ public class ProdInventoryController extends BaseController {
     @ResponseBody
     public TableDataInfo inventoryList(ProdInventoryVo prodInventoryVo) {
         startPage();
+        if (!ShiroUtils.getSysUser().isAdmin()) {
+            prodInventoryVo.setMercId(ShiroUtils.getUserId());
+        }
         List<ProdInventoryVo> list = prodInventoryVoService.selectProdInventoryVoList(prodInventoryVo);
         return getDataTable(list);
     }

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/prodInventory/service/impl/ProdInventoryVoServiceImpl.java

@@ -99,7 +99,7 @@ public class ProdInventoryVoServiceImpl implements IProdInventoryVoService {
         // 更新商品出入库单
         ProdInventoryOrder prodInventoryOrder = new ProdInventoryOrder();
         prodInventoryOrder.setIoFlag(EInventoryBillType.STOCKIN.getVal());
-        prodInventoryOrder.setIoType(EInventoryBillReason.IN_PURCHASE.getVal());
+        prodInventoryOrder.setIoType(EInventoryBillReason.IN_ALLOC.getVal());
         prodInventoryOrder.setInId(prodInventoryVo.getMercId());
         prodInventoryOrder.setDelFlag(EDelFlag.NO.getVal());
         prodInventoryOrder.setCreateUser(ShiroUtils.getLoginName());

08.src/Xingxi/xingxi-admin/src/main/resources/templates/business/vendorOrder/vendorOrder.html

@@ -260,13 +260,15 @@
 				html.push('<td>快递单号</td>');
 				html.push('<td>发货时间</td>');
 				html.push('<td>确认收货时间</td>');
-				html.push('</tr><tr>');
+				html.push('</tr>');
 				returnData.forEach((orderDelivery, index) => {
+					html.push('<tr>');
 					html.push('<td>' + orderDelivery.expressNo + '</td>');
 					html.push('<td>' + orderDelivery.deliveryTime + '</td>');
 					html.push('<td>' + orderDelivery.confirmTime + '</td>');
+					html.push('</tr>');
 				});
-				html.push('</tr></table>');
+				html.push('</table>');
 			}
 			return html.join('');
 		}

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/enums/EInventoryBillReason.java

@@ -12,13 +12,11 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum EInventoryBillReason {
-    IN_PURCHASE("IN_PURCHASE", "采购入库"),
-    IN_RETURN("IN_RETURN", "退货入库"),
-    IN_CHANGE("IN_CHANGE", "换货入库"),
-    IN_CANCEL("IN_CANCEL", "取消入库"),
-    OUT_SALE("OUT_SALE", "销售出库"),
-    OUT_CHANGE("OUT_CHANGE", "换货出库"),
-    OTHER("OTHER", "其它");
+    IN_PLATFORM("IN_PLATFORM", "平台入库"),
+    IN_ALLOC("IN_ALLOC", "分配入库"),
+    IN_RECYCLE("IN_RECYCLE", "回收入库"),
+    OUT_PLATFORM("OUT_PLATFORM", "平台出库"),
+    OUT_SALE("OUT_SALE", "销售出库");
 
     private String val;
     private String desc;
@@ -30,6 +28,6 @@ public enum EInventoryBillReason {
                 return value;
             }
         }
-        return EInventoryBillReason.OTHER;
+        return EInventoryBillReason.IN_PLATFORM;
     }
 }