出库单组盘

pengcheng
1 parent d0a045de
Showing 3 changed files with 101 additions and 251 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -246,35 +246,6 @@ public class InventoryDetail implements Serializable {
     @TableField(value = "userDef3")
     private String userDef3;
  
-    /**
-     * 自定义字段4
-     */
-    @TableField(value = "userDef4")
-    private String userDef4;
-
-    /**
-     * 自定义字段5
-     */
-    @TableField(value = "userDef5")
-    private String userDef5;
-
-    /**
-     * 自定义字段6
-     */
-    @TableField(value = "userDef6")
-    private String userDef6;
-
-    /**
-     * 自定义字段7
-     */
-    @TableField(value = "userDef7")
-    private String userDef7;
-
-    /**
-     * 自定义字段8
-     */
-    @TableField(value = "userDef8")
-    private String userDef8;
  
     /**
      * 处理标记
@@ -360,15 +331,5 @@ public class InventoryDetail implements Serializable {
  
     public static final String COL_USERDEF3 = "userDef3";
  
-    public static final String COL_USERDEF4 = "userDef4";
-
-    public static final String COL_USERDEF5 = "userDef5";
-
-    public static final String COL_USERDEF6 = "userDef6";
-
-    public static final String COL_USERDEF7 = "userDef7";
-
-    public static final String COL_USERDEF8 = "userDef8";
-
     public static final String COL_PROCESSSTAMP = "processStamp";
 }
 \ No newline at end of file
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
@@ -14,8 +13,6 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
-import com.huaheng.pc.config.zone.domain.Zone;
-import com.huaheng.pc.general.material.domain.Material;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -68,7 +65,6 @@ public class ShipmentDetailController extends BaseController
  
 		lambdaQueryWrapper
 				.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
-				.eq(ShipmentDetail::getEnable,true)
 				.eq(StringUtils.isNotEmpty(shipmentDetail.getShipmentCode()),ShipmentDetail::getShipmentCode,shipmentDetail.getShipmentCode())
 				.orderByAsc(ShipmentDetail::getId);
  
@@ -55,6 +55,10 @@
             <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered  table-hover"></table>
         </div>
         <div class="col-sm-12 select-info table-striped-right">
+            <ul class="select-list">
+                <li style="display: none">id：<input type="text" id="detailId"  /></li>
+                <li>出货数量：<input type="text" id="receiveNum"  /></li>
+            </ul>
             <table id="bootstrap-table1" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
         </div>
     </div>
@@ -64,52 +68,35 @@
     var addFlag = [[${@permission.hasPermi('shipment:shippingCombination:combination')}]];
     var cancelFlag = [[${@permission.hasPermi('shipment:shippingCombination:remove')}]];
     var taskTypeReal=[[${@dict.getType('taskType')}]];
-    var containerHeaderStatus = [[${@dict.getType('shipmentContainerHeaderStatus')}]]
-    var inventoryStatus = [[${@dict.getType('inventoryStatus')}]]
+    var containerHeaderStatus = [[${@dict.getType('shipmentContainerHeaderStatus')}]];
+    var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
  
     var prefix = ctx + "shipment/shippingCombination";
  
     var list_select=function(code) {
         $("#bootstrap-table1").bootstrapTable('removeAll');
         $("#bootstrap-table").bootstrapTable('removeAll');
-        let ids=null;
-        let id=localStorage.getItem('shipids');
-        if(id){
-            ids=id;
-        }
-        // console.log(code);
         $.ajax({
-            url: prefix + "/listShipmentDetail?code="+code+"&ids="+ids,
+            url: prefix + "/listShipmentDetail?code="+code,
             type: 'get',
-            // datatype: 'json',
-            // data: {
-            //     code: code
-            // },
             success: function (value) {
-                 // $("#bootstrap-table").bootstrapTable('load', value.data);
-                // console.log(value);
-                // $("#bootstrap-table1").bootstrapTable('removeAll');
-                // $("#bootstrap-table").bootstrapTable('removeAll');
-                var qty_shipment=0;
-                var qtyCompleted_shipment=0;
-
-                for (var i=0;i<value.data.length;i++){
-                    if(value.data[i].qty>value.data[i].qtyCompleted){
+                let qty_shipment=0;
+                let qtyCompleted_shipment=0;
+                for (let i=0;i<value.data.length;i++){
+                    if(value.data[i].shipQty>value.data[i].requestQty){
                         $("#bootstrap-table").bootstrapTable('insertRow',{index:0,row:{id:value.data[i].id,
-                                project:value.data[i].project,
-                                //name:value.data[i].name,
-                                receiptId:value.data[i].receiptId,
-                                receiptCode:value.data[i].receiptCode,
+                                shipmentId:value.data[i].shipmentId,
+                                shipmentCode:value.data[i].shipmentCode,
                                 materialCode:value.data[i].materialCode,
                                 materialName:value.data[i].materialName,
-                                specification:value.data[i].specification,
-                                qty:value.data[i].qty,
-                                qtyCompleted:value.data[i].qtyCompleted,
-                                inventoryStatus:value.data[i].inventoryStatus,
-                                unit:value.data[i].unit}});
+                                materialSpec:value.data[i].materialSpec,
+                                shipQty:value.data[i].shipQty,
+                                requestQty:value.data[i].requestQty,
+                                inventorySts:value.data[i].inventorySts,
+                                materialUnit:value.data[i].materialUnit}});
                     }
-                     qty_shipment = qty_shipment + value.data[i].qty;
-                     qtyCompleted_shipment = qtyCompleted_shipment + value.data[i].qtyCompleted;
+                     qty_shipment = qty_shipment + value.data[i].shipQty;
+                     qtyCompleted_shipment = qtyCompleted_shipment + value.data[i].requestQty;
  
                 }
                 $("#shipment_length").text(value.data.length);
@@ -117,44 +104,10 @@
                 $("#qtyCompleted_length").text(qtyCompleted_shipment);
              }
         });
-        $.ajax({
-            url: prefix + "/listCombinationDetail?code="+code,
-            type: 'get',
-            // datatype: 'json',
-            // data: {
-            //     code: code
-            // },
-            success: function (value) {
-                $("#bootstrap-table1").bootstrapTable('load', value.data);
-                // for (var i=0;i<value.data.length;i++){
-                //
-                //     $("#bootstrap-table1").bootstrapTable('insertRow',{index:0,
-                //         row:{
-                //             id:value.data[i].id,
-                //             headId:value.data[i].headId,
-                //             containerCode:value.data[i].containerCode,
-                //             locationCode:value.data[i].locationCode,
-                //             status:value.data[i].status,
-                //             materialName:value.data[i].materialName,
-                //             shipmentCode:value.data[i].shipmentCode,
-                //             taskType:value.data[i].taskType,
-                //             shipmentDetailId:value.data[i].shipmentDetailId,
-                //             materialCode:value.data[i].materialCode,
-                //             qty:value.data[i].qty,
-                //             userName:value.data[i].userName
-                //         }});
-                // }
-            }
-        })
-        localStorage.removeItem('shipids');
     };
  
  
     $("#bootstrap-table").bootstrapTable({
-        // url: prefix + "/list",
-        createUrl: prefix + "/add",
-        updateUrl: prefix + "/edit/{id}",
-        removeUrl: prefix + "/remove",
         contentType: "application/x-www-form-urlencoded",
         // search: true, //搜索
         // showRefresh: true,//刷新
@@ -164,25 +117,29 @@
         // detailView:true,
         // showExport: true, //导出
         // exportDataType: "all", //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
-        modalName: "入库组盘头",
+        modalName: "出库组盘头",
         // sidePagination: "server",
         pagination: true,   // 是否显示分页（*）
         pageNumber: 1,                                      // 初始化加载第一页，默认第一页
-        pageSize: 10,                                       // 每页的记录行数（*）
-        pageList: [10, 25, 50],
-        columns: [
-            {
-                field:'work',
-                title: '操作',
-                align: 'center',
-                events: "operateEvents",
-                formatter: function(value, row, index) {
-                    var actions = [];
-                    actions.push('<a id="qty" class="btn btn-success btn-xs ' + addFlag + '" href="#"  onclick="" ><i class="fa fa-edit"></i>组盘</a>');
-                    // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
+        pageSize: 50,                                       // 每页的记录行数（*）
+        pageList: [10, 25, 50,100],
+        onClickRow:function(row,ele,field){
+            let code=$("#code").val();
+            $("#detailId").val(row.id);
+            $("#receiveNum").val(row.shipQty-row.requestQty);
+            $.ajax({
+                url:prefix+'/getInventory',
+                type:'post',
+                data:{
+                    code:code,
+                    id:row.id
+                },
+                success:res=>{
+                    $("#bootstrap-table1").bootstrapTable('load',res.data)
                 }
-            },
+            })
+        },
+        columns: [
             {
                 field : 'id',
                 title : '明细id'
@@ -196,155 +153,122 @@
                 title:"物料名称"
             },
             {
-                field:'specification',
+                field:'materialSpec',
                 title:"物料规格"
             },
             {
-                field : 'qty',
+                field : 'shipQty',
                 title : '单据数量'
             },
             {
-                field : 'qtyCompleted',
+                field : 'requestQty',
                 title : '已出数量'
             },
             {
-                field : 'inventoryStatus',
+                field : 'inventorySts',
                 title : '库存状态',
                 formatter: function(value, row, index) {
                     return $.table.selectDictLabel(inventoryStatus, value);
                 },
             },
             {
-                field : 'project',
-                title : '项目号'
-            },
-
-            {
-                field : 'unit',
+                field : 'materialUnit',
                 title : '单位'
             },
             ]
     });
  
     $("#bootstrap-table1").bootstrapTable({
-        // url: prefix + "/list",
-        createUrl: prefix + "/add",
-        updateUrl: prefix + "/edit/{id}",
-        removeUrl: prefix + "/remove",
-        // search: true, //搜索
-        showRefresh: true, //刷新
-        showToggle:true, //视图切换
         clickToSelect: true,
         showColumns:true, //列选择
-        // detailView:true,
-        showExport: true, //导出
-        exportDataType: "all",  //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
-        modalName: "入库组盘头",
+        modalName: "库存",
         iconSize: "outline",
         toolbar: "#toolbar",
         contentType: "application/x-www-form-urlencoded",
-        // sidePagination: "server",
         pagination: true,   // 是否显示分页（*）
         pageNumber: 1,                                      // 初始化加载第一页，默认第一页
         pageSize: 10,                                       // 每页的记录行数（*）
         pageList: [10, 25, 50],
-        onRefresh: function(){
-            list_select($("#code").val());
-        },
         columns: [
             {
-                field : 'id',
-                title : '组盘明细id',
-                visible:false
+                title: '操作',
+                align: 'center',
+                events:'operateEvents',
+                formatter: function(value, row, index) {
+                    let actions = [];
+                    actions.push('<a id="cancel" class="btn btn-success btn-xs" style="background-color: #ac2925" href="#" onclick="Combination(\'' + row.id + '\')"><i class="fa fa-edit"></i>组盘</a> ');
+                    return actions.join('');
+                }
             },
             {
-                field : 'headId',
-                title : '组盘头id'
+                field : 'id',
+                title : 'id'
             },
             {
-                field : 'containerCode',
-                title : '容器编号'
+                field : 'companyCode',
+                title : '货主'
             },
             {
                 field : 'locationCode',
                 title : '库位编号'
             },
-            // {
-            //     field : 'shipmentCode',
-            //     title : '出库单号'
-            // },
-            {
-                field : 'materialCode',
-                title : '存货编码'
-            },
             {
-                field:"materialName",
-                title:"物料名称"
-            },
-            {
-                field : 'taskTypeReal',
-                title : '预期任务类型',
-                formatter: function(value, row, index) {
-                    return $.table.selectDictLabel(taskTypeReal, value);
-                },
+                field : 'containerCode',
+                title : '容器编号'
             },
             {
                 field : 'qty',
-                title : '配盘数量'
+                title : '数量'
             },
             {
-                field : 'status',
-                title : '状态',
-                formatter: function(value, row, index) {
-                    return $.table.selectDictLabel(containerHeaderStatus, value);
-                },
+                field : 'materialCode',
+                title : '存货编码'
             },
             {
-                field : 'project',
-                title : '项目号'
+                field : 'materialName',
+                title : '物料名称'
             },
             {
-                field : 'shipmentDetailId',
-                title : '出库单明细id'
+                field : 'materialSpec',
+                title : '物料规格'
             },
             {
-                field : 'userName',
-                title : '操作人'
+                field : 'supplierCode',
+                title : '供应商编码',
+                visible:false
             },
             {
-                title: '操作',
+                field : 'inventorySts',
+                title : '库存状态' ,
                 align: 'center',
-                events:'operateEvents',
                 formatter: function(value, row, index) {
-                    var actions = [];
-                    if (row.status == 0) {
-                        actions.push('<a id="cancel" class="btn btn-danger btn-xs ' + cancelFlag + '" href="#" onclick="cancelCombination(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                    }
-                    return actions.join('');
+                    return $.table.selectDictLabel(inventoryStatus, value);
                 }
-            }
+            },
         ]
     });
  
-    window.operateEvents = {
-        'click #qty': function (e, value, row, index) {
-            var url = prefix + '/combination?';
-            jQuery.each(row, function(key, val) {
-                url = url + key + "=" + encodeURI(val) + "&";
-            });
-            open("添加出库组盘", url);
-        }
-    };
-
-    function cancelCombination(id) {
-        $.modal.confirm("确定删除该组盘？", function() {
-            var  url = prefix + "/cancelCombination";
-            var  type = "post";
-            var  dataType = "json";
-            var  data = JSON.stringify([id]);
-            var contentType="application/json";
-            submit(url,type,dataType, data,contentType);
-        });
+    function Combination(id) {
+        let num=$("#receiveNum").val();
+        let shipmentDetailId=$("#detailId").val();
+        $.ajax({
+            url:ctx + "shipment/shippingCombination/Addcombination",
+            type:'post',
+            data:{
+                shipmentDetailId:shipmentDetailId,
+                inventoryId:id,
+                shipQty:num,
+            },
+            success:function (response) {
+                if(response.code===200){
+                    $.modal.msgSuccess('成功');
+                    $("#list-btn").click();
+                }
+                else {
+                    $.modal.msg(response.msg)
+                }
+            }
+        })
     }
  
     function submit(url, type, dataType, data,content) {
@@ -368,46 +292,15 @@
         $.ajax(config)
     }
  
-    function open(title, url, width, height){
-        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
-            width = 'auto';
-            height = 'auto';
-        }
-        if (title==null){
-            title = false;
-        }
-        if (url==null){
-            url="404.html";
-        }
-        if ($.common.isEmpty(width)) {
-            width = 800;
-            // width = ($(window).width() - 100);
-        }
-        if ($.common.isEmpty(height)) {
-            height = ($(window).height() - 50);
-        }
-        layer.open({
-            type: 2,
-            area: [width + 'px', height + 'px'],
-            fix: false,
-            //不固定
-            maxmin: true,
-            shade: 0.3,
-            title: title,
-            content: url
-            // shadeClose: true, //点击遮罩关闭层
-        })
-    }
-
     function initPage() {
-        var auto = localStorage.getItem("auto");
-        var shipmentCode = localStorage.getItem("shipmentCode");
+        let auto = localStorage.getItem("auto");
+        let shipmentCode = localStorage.getItem("shipmentCode");
         $("#code").val(shipmentCode);
         if (auto == "true")   {
-            var  url = prefix + "/autoCombination";
-            var  type = "post";
-            var  dataType = "json";
-            var  data = {"shipmentCode" : shipmentCode};
+            let  url = prefix + "/autoCombination";
+            let  type = "post";
+            let  dataType = "json";
+            let  data = {"shipmentCode" : shipmentCode};
             submit(url,type,dataType, data);
         }
         else{
@@ -421,7 +314,7 @@
  
         $("#list-btn").click(function () {
             list_select($("#code").val());
-        })
+        });
  
         initPage();
     });