edit

xumiao
1 parent f5c54a76
Showing 4 changed files with 65 additions and 15 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/resources/templates/receipt/finishedProductReceiving/finishedProductReceiving.html
src/main/resources/templates/receipt/receiptDetail/add.html
src/main/resources/templates/receipt/receiptHeader/edit.html
@@ -211,8 +211,8 @@ public class ReceiptHeaderController extends BaseController {
     @ResponseBody
     public AjaxResult editSave(ReceiptHeader receiptHeader) {
 //        ReceiptHeader receiptHeader1 = receiptHeaderService.getById(receiptHeader.getId());
-        if (!QuantityConstant.RECEIPT_TYPE_PPI.equals(receiptHeader.getReceiptType())){
-            return AjaxResult.error("只有手持入库单可修改");
+        if (!QuantityConstant.RECEIPT_TYPE_PPI.equals(receiptHeader.getReceiptType())&&!QuantityConstant.MES_RECEIPT_TYPE_SI.equals(receiptHeader.getReceiptType())){
+            return AjaxResult.error("只有手持入库单和產成品入庫可修改");
         }
         receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
         return toAjax(receiptHeaderService.updateById(receiptHeader));
@@ -75,6 +75,7 @@
     var uWarehouseNames = [[${@warehouseWu.getName()}]];
     var company =[[${@companyService.getCode()}]];
     var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
+    var editFlag = [[${@permission.hasPermi('receipt:receiptHeader:edit')}]];
     var receiptId = '';
     var receiptCode = '';
     var resubmit = new Date().getTime();
@@ -163,6 +164,7 @@
     $(function() {
         var options = {
             url: prefix + "/list",
+            updateUrl: ctx + "receipt/receiptHeader/edit/{id}",
             modalName: "产成品入库单",
             sortName: "created",
             sortOrder: "desc",
@@ -181,6 +183,15 @@
                     checkbox: true
                 },
                 {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
                     field : 'id',
                     title : 'id',
                     visible: false
@@ -69,7 +69,7 @@
                 <input id="qty" name="qty" class="form-control" type="text">
             </div>
         </div>
-        <span style="color: red;display:none;margin-left: 191px;" class="qtyClass" >*超出可收数量</span>
+<!--        <span style="color: red;display:none;margin-left: 191px;" class="qtyClass" >*超出可收数量</span>-->
         <!--<div class="form-group">-->
             <!--<label class="col-sm-3 control-label">供应商编码：</label>-->
             <!--<div class="col-sm-8">-->
@@ -244,18 +244,18 @@
         }
         $.modal.closeLoading();
     }
-    $("#qty").blur(
-        function () {
-            var qty= $("input[name='qty']").val();
-            if(qty > 10){
-                $(".qtyClass").css("display","block")
-                $(".qtyForm").css("margin-bottom","0px");
-            }else {
-                $(".qtyClass").css("display","none")
-                $(".qtyForm").css("margin-bottom","15px");
-            }
-        }
-    );
+    // $("#qty").blur(
+    //     function () {
+    //         var qty= $("input[name='qty']").val();
+    //         if(qty > 10){
+    //             $(".qtyClass").css("display","block")
+    //             $(".qtyForm").css("margin-bottom","0px");
+    //         }else {
+    //             $(".qtyClass").css("display","none")
+    //             $(".qtyForm").css("margin-bottom","15px");
+    //         }
+    //     }
+    // );
     $(function () {
         layui.use('laydate', function() {
             var laydate = layui.laydate;
@@ -19,6 +19,24 @@
             </div>
         </div>
         <div class="form-group">
+            <label class="col-sm-3 control-label">货主编码：</label>
+            <div class="col-sm-8">
+                <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
+                    <option value="">所有</option>
+                    <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}" th:attr="code = ${company['code']}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">u8仓库：</label>
+            <div class="col-sm-8">
+                <select name="uWarehouseCode" id="uWarehouseCode"  class="form-control" th:with="warehouse=${@warehouseWu.selectListAndCode()}">
+                    <option value="">所有</option>
+                    <option th:each="e : ${warehouse}" th:text="${e['uWarehouseName']}" th:value="${e['uWarehouseCode']}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
             <label class="col-sm-3 control-label">入库单备注：</label>
             <div class="col-sm-8">
                 <input id="receiptNote" name="receiptNote" class="form-control" type="text" th:field="*{receiptNote}">
@@ -82,6 +100,27 @@
                 }
             }
         });
+
+        $("select[name='companyCode']").change(function (e) {
+            let companyCode = $("select[name='companyCode'] option:selected").attr('code');
+            $.ajax({
+                url: ctx + "receipt/receiptHeader/getwarehouse",
+                type: 'post',
+                data: {code: companyCode},
+                success: function (response) {
+                    if (response.code === 200) {
+                        $("select[name='uWarehouseCode']").children().remove();
+                        $("select[name='uWarehouseCode']").append(`<option value="">所有</option>`);
+                        for (let item of response.data) {
+                            let option = `<option value="${item.uWarehouseCode}">${item.uWarehouseName}</option>`;
+                            $("select[name='uWarehouseCode']").append(option);
+                        }
+                    } else {
+                        $.modal.msgError(response.msg)
+                    }
+                }
+            })
+        })
     })
  
 </script>