Головна сторінка Огляд Довідка
Увійти
hexiugang
/
iamberry-common-parent
Слідкувати 3
Зірка 3
Відгалуження 1
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

库存管理

wangxiaoming 5 роки тому
батько
29c3904f89
коміт
c9d4456cb9
6 змінених файлів з 39 додано та 17 видалено
Розділений вигляд Показати статистику Diff
  1. 0 2
      watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java
  2. 1 0
      watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml
  3. 3 0
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java
  4. 1 1
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/scm/AdminScmOrderController.java
  5. 33 13
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl
  6. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

+ 0 - 2
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java
Переглянути файл 

@@ -1139,8 +1139,6 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
                     if(flag < 1){
 
                         throw new RuntimeException("【出库】更新库存失败，增加库存记录失败。");
 
                     }
 
-
 
-                    logger.info("---------"+sdf.format(new Date())+"待发货标记出库："+item.getItemNum()+"件,订单号："+item.getItemOrderId());
 
                 }else{
 
                     throw new RuntimeException("【出库】更新库存失败，"+ warehouseName +"["+ item.getItemProductName()+ "("+ item.getItemProductColor() +")" +"]库存不足。");
 
                 }

+ 1 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml
Переглянути файл 

@@ -73,6 +73,7 @@
 
   <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >

     select

     fi.inventory_id,

+    fi.warehouse_id,

     fi.inventory_product_name,

     fi.inventory_product_bar,

     fi.inventory_remaining_num,

+ 3 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java
Переглянути файл 

@@ -140,6 +140,9 @@ public class InventoryController {
 
         List<WarehouseInfo> warehouseList = inventoryLogService.listFactoryInfo();
 
         mv.addObject("warehouseList",warehouseList);*/
 
         StitchAttrUtil.getSa().setModelAndView(inventoryLog, mv, "/admin/inventory/select_inventoryLog_list", result);
 
+
 
+        InventoryInfo inventoryInfo = inventoryService.getByInventoryByBar(inventoryLog.getLogProductBar(),inventoryLog.getLogWarehouseId());
 
+        mv.addObject("inventoryInfo",inventoryInfo);
 
         return mv;
 
     }

+ 1 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/scm/AdminScmOrderController.java
Переглянути файл 

@@ -300,7 +300,7 @@ public class AdminScmOrderController {
 
     @ResponseBody
 
     @RequestMapping("/get_order")
 
     @RequiresPermissions(value = {"scmOrder:order:add", "scmOrder:update:add", "scmOrder:order:list", "scmOrder:order:send"}, logical = Logical.OR)
 
-    public ResponseJson addSalesOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
 
+    public ResponseJson getOrder(HttpServletRequest request,ScmOrderInfo scmOrderInfo) throws Exception {
 
         if(scmOrderInfo.getOrderId() == null && (scmOrderInfo.getOrderMadeId() == null||"".equals(scmOrderInfo.getOrderMadeId())) &&
 
                 (scmOrderInfo.getOrderNo() == null || "".equals(scmOrderInfo.getOrderNo()))){
 
             return new ResponseJson(500, "查询失败", 500);

+ 33 - 13
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl
Переглянути файл 

@@ -29,6 +29,10 @@
 
             text-overflow: ellipsis;
 
         }
 
 
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
 
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
 
+
 
+
 
     </style>
 
 </head>
 
 <body>
 
@@ -38,6 +42,17 @@
 
     <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 <div class="page-container">
 
+
 
+    <div class="row cl" style="    margin-bottom: 20px;">
 
+        <label class="form-label col-12">
 
+            <div class="tit-2">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</div>
 
+        </label>
 
+        <div class="formControls col-9">
 
+        </div>
 
+    </div>
 
+
 
+    <#--<pre style="font-size: 12px;margin-top: -1%;">产品名称：${inventoryInfo.inventoryProductName!''}(${inventoryInfo.productColorName!''}-${inventoryInfo.inventoryProductBar!''})</pre>-->
 
+
 
     <div class="text-c">
 
         <form name="form1" action="${path}/admin/inventory/select_inventoryLog_list" method="post">
 
         <#--<input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
 
@@ -74,13 +89,14 @@
 
         <table class="table table-border table-bordered table-bg table-hover table-sort">
 
             <thead>
 
             <tr class="text-c">
 
-                <th width="100">产品名称</th>
 
-                <th width="100">产品sku</th>
 
+                <th width="35">时间</th>
 
+                <#--<th width="100">产品名称</th>-->
 
+                <#--<th width="100">产品sku</th>-->
 
                 <#--<th width="100">仓库名称</th>-->
 
-                <th width="100">变动数量</th>
 
-                <th width="100">类型</th>
 
-                <th width="100">质量类型</th>
 
-                <th width="100">操作类型</th>
 
+                <th width="20">变动数量</th>
 
+                <th width="20">类型</th>
 
+                <th width="20">质量类型</th>
 
+                <th width="20">操作类型</th>
 
                 <th width="100">备注</th>
 
             </tr>
 
             </thead>
 
@@ -88,11 +104,14 @@
 
             <#if (page.dataList?size > 0)>
 
                 <#list page.dataList as info>
 
                 <tr>
 
-                    <td class="text-c" width="100">${info.logProductName!}</td>
 
-                    <td class="text-c" width="100">${info.logProductBar!}</td>
 
+                    <td class="text-c" width="35">
 
+                        ${(info.logCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}
 
+                    </td>
 
+                    <#--<td class="text-c" width="100">${info.logProductName!}</td>-->
 
+                    <#--<td class="text-c" width="100">${info.logProductBar!}</td>-->
 
                     <#--<td class="text-c" width="100">${info.logWarehouseName!}</td>-->
 
-                    <td class="text-c" width="100">${info.logRemainingNum!}</td>
 
-                    <td class="text-c" width="100">
 
+                    <td class="text-c" width="20">${info.logRemainingNum!}</td>
 
+                    <td class="text-c" width="20">
 
                         <#if info.logType == 1>
 
                             采购
 
                         </#if>
 
@@ -103,7 +122,7 @@
 
                             次品
 
                         </#if>
 
                     </td>
 
-                    <td class="text-c" width="100">
 
+                    <td class="text-c" width="20">
 
                         <#if info.logOperationType == 1>
 
                             入库
 
                         </#if>
 
@@ -111,7 +130,7 @@
 
                             出库
 
                         </#if>
 
                     </td>
 
-                    <td class="text-c" width="100">
 
+                    <td class="text-c" width="20">
 
                         <#if info.logQualityType??>
 
                             <#if info.logQualityType == 1>
 
                                 良品
 
@@ -121,7 +140,8 @@
 
                             </#if>
 
                         </#if>
 
                     </td>
 
-                    <td class="text-c" width="100">${info.logDesc!}</td>
 
+                    <td class="" width="100">${info.logDesc!}</td>
 
+
 
                 </tr>
 
                 </#list>
 
             <#else >

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl
Переглянути файл 

@@ -123,7 +123,7 @@
 
                             <i class="Hui-iconfont">出库</i>
 
                         </a>
 
                         <a style="text-decoration:none" href="javascript:;" title="出入库记录"
 
-                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}');">
 
+                           onclick="getInventoryLog('${path}/admin/inventory/select_inventoryLog_list?logProductBar=${info.inventoryProductBar!''}&logWarehouseId=${info.warehouseId!''}');">
 
                             <i class="Hui-iconfont">出入库记录</i>
 
                         </a>
 
                     </td>