Merge remote-tracking branch 'origin/develop' into develop

mahuandong
2 parents 0b3104a2 ac3c082a
Showing 19 changed files with 141 additions and 561 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/inventory/adjustDetail/add.html
src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
src/main/resources/templates/shipment/shipmentDetail/add.html
src/main/resources/templates/shipment/shipmentHeader/add.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/shipment/shipmentHeaderHistory/add.html
src/main/resources/templates/shipment/shipmentHeaderHistory/edit.html
src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -165,6 +165,10 @@ public class adjustDetailController extends BaseController {
             if(StringUtils.isEmpty(adjustDetailEdit.getAgreeBy()) || adjustDetailEdit.getStatus() < 1 ){
                 return AjaxResult.error("单据未审批不允许调整");
             }
+            //不能重复调整
+            if(adjustDetailEdit.getStatus() >= 3){
+                return AjaxResult.error("不能重复调整！");
+            }
             adjustDetailService.updateAdjustDetail(adjustDetailEdit);
         }
         return AjaxResult.success("调整下发成功！");
@@ -45,6 +45,8 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
     @Resource
     private CycleCountDetailService cycleCountDetailService;
     @Resource
+    private AdjustHeaderService adjustHeaderService;
+    @Resource
     private MaterialService materialService;
     @Resource
     private CheckDetailService checkDetailService;
@@ -72,10 +74,14 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
     @Transactional
     @Override
     public AjaxResult addDetails(AdjustDetail adjustDetail) {
-        //数据直接插入表里
-        //查询主单据
-
  
+        //查询主单据
+        AdjustHeader adjustHeader = new AdjustHeader();
+        adjustHeader.setCode(adjustDetail.getAdjustCode());
+        adjustHeader.setWarehouseCode(adjustDetail.getWarehouseCode());
+        adjustHeader.setCompanyCode(adjustDetail.getCompanyCode());
+        LambdaQueryWrapper<AdjustHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(adjustHeader);
+        adjustHeader = adjustHeaderService.getOne(lambdaQueryWrapper);
         //检查库存
         if((adjustDetail.getInventoryDetailId()) != null){
             InventoryDetail inventoryDetail = inventoryDetailService.getById(adjustDetail.getInventoryDetailId());
@@ -103,17 +109,16 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
             if(!material.getName().equals(adjustDetail.getMaterialName())){
                return AjaxResult.error("物料名称错误！");
             }
-
         }else{
             return AjaxResult.error("物料编码错误！");
         }
+        adjustDetail.setProblemType(adjustHeader.getProblemType());//调整类型
         adjustDetail.setMaterialUnit(material.getUnit());
         adjustDetail.setMaterialSpec(material.getSpec());
         adjustDetail.setCreated(new Date());
         adjustDetail.setCreatedBy(ShiroUtils.getLoginName());
         adjustDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
         adjustDetail.setLastUpdated(new Date());
-
         this.saveOrUpdate(adjustDetail);
  
         return AjaxResult.success("新增调整明细成功！");
@@ -157,7 +162,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
             AjaxResult.error("该单据已调整，不允许再次调整！" );
         }
         //查询调整的库存明细
-        InventoryDetail inventoryDetail ;
+        InventoryDetail inventoryDetail;
         //调整单中不带库存明细时不查询
         if(adjustDetail.getInventoryDetailId() != null) {
             inventoryDetail = inventoryDetailService.getById(adjustDetail.getInventoryDetailId());
@@ -166,23 +171,16 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
                 return AjaxResult.error("调整单和所调整库存的库位容器不符，前检查数据");
             }
             //验证该条库存是不是正在使用，验证库存明细
-            /*Location location = new Location();
+            Location location = new Location();
             location.setCode(inventoryDetail.getLocationCode());
             location.setWarehouseCode(inventoryDetail.getWarehouseCode());
             LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(location);
             location = locationService.getOne(lambdaQueryWrapper);
             if (!location.getStatus().equals("empty")) {
                return AjaxResult.error (inventoryDetail.getId() + "库存非空闲，请等待其他任务完成再进行调整！");
-            }*/
-
-            //判断调整哪一个属性值
-            /*以下方法有待验证讨论，BigDecimal传入null,如何避免传入0？*/
-
-            //把BigDecimal类型转换成String再判断null
-
-            String toQtyString = adjustDetail.getToQty().toString(); //调整后库存
-            String gapQtyString = adjustDetail.getGapQty().toString(); //调整变动数量
-            if (StringUtils.isNotEmpty(toQtyString) || StringUtils.isNotEmpty(gapQtyString)) {
+            }
+            //判断调整库存状态还是数量
+            if (adjustDetail.getToQty() != null || adjustDetail.getGapQty() != null) {
                 //调整数量
                 updateAdjustDetailNumber(adjustDetail, inventoryDetail);
             }
@@ -240,9 +238,10 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
             inventoryDetail.setQty(adjustDetail.getToQty());//调整后的数量
             inventoryDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
             inventoryDetail.setLastUpdated(new Date());
-            inventoryDetailService.saveOrUpdate(inventoryDetail);
-
-        }
+            Boolean j =  inventoryDetailService.saveOrUpdate(inventoryDetail);
+            if(j == false){
+                throw new SecurityException("调整修改库存失败！");
+            }        }
         //写入库存交易记录
         InventoryTransaction inventoryTransaction = new InventoryTransaction();
         inventoryTransaction.setWarehouseCode(inventoryDetail.getWarehouseCode());
@@ -256,8 +255,8 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
         inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
         inventoryTransaction.setTaskQty(adjustDetail.getGapQty());
         inventoryTransaction.setInventorySts(inventoryDetail.getInventorySts());
-        inventoryTransaction.setReferCode(inventoryDetail.getReferCode());
-        inventoryTransaction.setReferDetailId(inventoryDetail.getReferDetailId());
+        inventoryTransaction.setReferCode(adjustDetail.getAdjustCode());
+        inventoryTransaction.setReferDetailId(adjustDetail.getId().toString());
         inventoryTransaction.setBatch(inventoryDetail.getBatch());
         inventoryTransaction.setLot(inventoryDetail.getLot());
         inventoryTransaction.setProjectNo(inventoryDetail.getProjectNo());
@@ -281,8 +280,10 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
 //            inventoryTransaction.setBillCode();
         inventoryTransaction.setBillDetailId(inventoryDetail.getReceiptDetailId());
         inventoryTransaction.setSupplierCode(inventoryDetail.getSupplierCode());
-        inventoryTransactionService.saveOrUpdate(inventoryTransaction);
-
+        Boolean k = inventoryTransactionService.saveOrUpdate(inventoryTransaction);
+        if(k == false){
+            throw new SecurityException("调整单库存交易生成失败!");
+        }
     }
  
     /**
@@ -295,11 +296,12 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
  
         //修改库存的状态
         inventoryDetail.setInventorySts(adjustDetail.getToInventorySts());//修改为调整库存
+        inventoryDetail.setExpirationDate(adjustDetail.getExpirationDate());
         inventoryDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
         inventoryDetail.setLastUpdated(new Date());
         inventoryDetailService.saveOrUpdate(inventoryDetail);
  
-        //写入库存交易，库存交易2条一条出，一条入
+        //写入库存交易，2条一条出，一条入
         //调整出
         InventoryTransaction inventoryTransaction = new InventoryTransaction();
         inventoryTransaction.setWarehouseCode(inventoryDetail.getWarehouseCode());
@@ -313,8 +315,8 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
         inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
         inventoryTransaction.setTaskQty(BigDecimal.ZERO);//数量不变
         inventoryTransaction.setInventorySts(adjustDetail.getFromInventorySts());//状态
-        inventoryTransaction.setReferCode(inventoryDetail.getReferCode());
-        inventoryTransaction.setReferDetailId(inventoryDetail.getReferDetailId());
+        inventoryTransaction.setReferCode(adjustDetail.getAdjustCode());
+        inventoryTransaction.setReferDetailId(adjustDetail.getId().toString());
         inventoryTransaction.setBatch(inventoryDetail.getBatch());
         inventoryTransaction.setLot(inventoryDetail.getLot());
         inventoryTransaction.setProjectNo(inventoryDetail.getProjectNo());
@@ -346,8 +348,8 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
         inventoryTransaction2.setMaterialUnit(inventoryDetail.getMaterialUnit());
         inventoryTransaction2.setTaskQty(BigDecimal.ZERO);//数量不变
         inventoryTransaction2.setInventorySts(inventoryDetail.getInventorySts());//状态
-        inventoryTransaction2.setReferCode(inventoryDetail.getReferCode());
-        inventoryTransaction2.setReferDetailId(inventoryDetail.getReferDetailId());
+        inventoryTransaction.setReferCode(adjustDetail.getAdjustCode());
+        inventoryTransaction.setReferDetailId(adjustDetail.getId().toString());
         inventoryTransaction2.setBatch(inventoryDetail.getBatch());
         inventoryTransaction2.setLot(inventoryDetail.getLot());
         inventoryTransaction2.setProjectNo(inventoryDetail.getProjectNo());
@@ -130,17 +130,11 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
  
     @Override
     public List<InventoryDetail> selectBysql(String sql, ShipmentDetail shipmentDetail, String sqll, ShipmentPreference shipmentPreference) {
-       if(shipmentPreference.getAllowQcCheckResult() == false) {
-           sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
-                   "and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
-                   "and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
-                   "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+ sqll;
+       if(shipmentPreference.getAllowQcCheckResult() == true) {
+           sql = sql +"'" + shipmentDetail.getId() + "' \n"+ sqll;
        }else {
-           sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
-                   "and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
-                   "and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
-                   "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+
-                   "and qcCheck=1\n"+ sqll;
+           sql = sql +"'" + shipmentDetail.getId() + "' \n"+
+                   "and i.qcCheck=1\n"+ sqll;
        }
         return inventoryDetailMapper.selectBysql(sql);
     }
@@ -481,6 +481,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         if (shipmentDetailList.size() < 1 || shipmentDetailList == null) {
             return AjaxResult.error("找不到子单链");
         }
+        for(ShipmentDetail shipmentDetail: shipmentDetailList){
+            if(shipmentDetail.getWaveId() != 0){
+                return AjaxResult.error(shipmentCode+"单号已加入波次"+shipmentDetail.getWaveId()+",无法自动组盘");
+            }
+        }
         return this.autoCombination(shipmentDetailList);
     }
  
@@ -4,6 +4,7 @@ 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;
@@ -144,6 +145,9 @@ public class ShipmentDetailController extends BaseController
 	@ResponseBody
 	public AjaxResult editSave(ShipmentDetail shipmentDetail)
 	{
+		if(shipmentDetail.getStatus()>100 ){
+			return AjaxResult.error("超过订单池，出库明细不能修改");
+		}
 		 if(shipmentDetailService.saveOrUpdate(shipmentDetail)==false){
 		 	return AjaxResult.error("出库明细修改失败");
 		 }else {
@@ -160,6 +164,18 @@ public class ShipmentDetailController extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
+		if (StringUtils.isEmpty(ids))
+			return AjaxResult.error("id不能为空");
+		for (Integer id : Convert.toIntArray(ids))
+		{
+			ShipmentDetail shipmentDetail=shipmentDetailService.getById(id);
+			if(shipmentDetail == null){
+				return AjaxResult.error("id为"+id+"的单据明细找不到");
+			}
+			if(shipmentDetail.getStatus()>100 && shipmentDetail.getStatus()<500){
+				return AjaxResult.error("此单据状态在订单池和拣货完成之间，无法删除");
+			}
+		}
         AjaxResult result = shipmentDetailService.deleteDetail(ids);
 		return result;
 	}
@@ -133,7 +133,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
         if (list.size() > 1) {
             return AjaxResult.error("有多个主单据，不能一起删除！");
         }
-        if (list.get(0).get("firstStatus") > 100) {
+        if (list.get(0).get("status") > 100) {
             return AjaxResult.error("单据状进入订单池，不允许删除明细");
         }
         Integer result = shipmentDetailMapper.batchDelete(ids);
@@ -168,6 +168,12 @@ public class ShipmentHeaderController extends BaseController
 		for (Integer id : Convert.toIntArray(ids))
 		{
 			ShipmentHeader shipmentHeader=shipmentHeaderService.getById(id);
+			if(shipmentHeader == null){
+				return AjaxResult.error("id为"+id+"的主单单据找不到");
+			}
+			if(shipmentHeader.getFirstStatus()>100 && shipmentHeader.getFirstStatus()<500){
+				return AjaxResult.error("此单据状态在订单池和拣货完成之间，无法删除");
+			}
  
 			//出库单设定为历史出库单，并删除出库单
 			shipmentHeaderService.addHistory(shipmentHeader);
@@ -167,7 +167,7 @@ public class IndexController extends BaseController
                 "    union all\n" +
                 "    SELECT date_sub(curdate(), interval 6 day) as click_date\n" +
                 ") a left join (\n" +
-                "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCode()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND h.processStamp=20 GROUP BY DATE(h.created)\n" +
+                "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCode()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND d.status=30 GROUP BY DATE(h.created)\n" +
                 ") b on a.click_date = b.created ORDER BY a.click_date;";
         List<LinkedHashMap<String, Object>> list2 = mapper.selectCommon(sql);
  
@@ -1287,9 +1287,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         }
         locationService.updateById(locationRecord);
         //如果是整出，删掉这个库位上的这个托盘，否则更改托盘状态
-        Container containerRecord = new Container();
+        LambdaQueryWrapper<Container> containerLam = Wrappers.lambdaQuery();
+        containerLam.eq(Container::getCode,task.getContainerCode());
+        Container ctn = containerService.getOne(containerLam);
+        if(ctn == null){
+            throw new ServiceException("系统无此容器");
+        }
         if(task.getTaskType()==300) {
-            containerService.updateLocationCodeAndStatus(task.getContainerCode(),"","empty");
+            if(ctn.getContainerType().equals("LS")){
+                Boolean flag = containerService.removeById(ctn.getId());
+                if(flag == false){
+                    throw new ServiceException("删除临时容器失败");
+                }
+            }else {
+                containerService.updateLocationCodeAndStatus(task.getContainerCode(), "", "empty");
+            }
         }
         else{
             //查询是否存在关联的库存，入如果没有就修改容器状态为empty
@@ -101,7 +101,7 @@
                 <input id="materialUnit" name="materialUnit" class="form-control" type="text">
             </div>
         </div>-->
-        <div class="form-group">
+        <!--<div class="form-group">
             <label class="col-sm-3 control-label">调整类型：</label>
             <div class="col-sm-8">
                 <select id="problemType" name="problemType" class="form-control"
@@ -109,9 +109,9 @@
                     <option th:each="dict : ${problemType}" th:text="${dict['dictLabel']}"
                             th:value="${dict['dictValue']}"></option>
                 </select>
-                <!--<input id="problemType" name="problemType"  class="form-control" type="text" >-->
+                &lt;!&ndash;<input id="problemType" name="problemType"  class="form-control" type="text" >&ndash;&gt;
             </div>
-        </div>
+        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">属性号：</label>
             <div class="col-sm-8">
@@ -143,8 +143,8 @@
             <label class="col-sm-3 control-label">调整前库存状态：</label>
             <div class="col-sm-8">
                 <select id="fromInventorySts" name="fromInventorySts" class="form-control"
-                        th:with="fromInventorySts=${@dict.getType('inventoryStatus')}">
-                    <option th:each="dict : ${fromInventorySts}" th:text="${dict['dictLabel']}"
+                        th:with="fromInventoryStatus=${@dict.getType('inventorySts')}">
+                    <option th:each="dict : ${fromInventoryStatus}" th:text="${dict['dictLabel']}"
                             th:value="${dict['dictValue']}"></option>
                 </select>
             </div>
@@ -153,22 +153,12 @@
                 <label class="col-sm-3 control-label">调整后库存状态：</label>
                 <div class="col-sm-8">
                     <select id="toInventorySts" name="toInventorySts" class="form-control"
-                            th:with="toInventorySts=${@dict.getType('inventoryStatus')}">
-                        <option th:each="dict : ${toInventorySts}" th:text="${dict['dictLabel']}"
+                            th:with="toInventoryStatus=${@dict.getType('inventorySts')}">
+                        <option th:each="dict : ${toInventoryStatus}" th:text="${dict['dictLabel']}"
                                 th:value="${dict['dictValue']}"></option>
                     </select>
                 </div>
             </div>
-            <!--<div class="form-group">
-                <label class="col-sm-3 control-label">调整状态：</label>
-                <div class="col-sm-8">
-                    <select id="status" name="status" class="form-control"
-                            th:with="status=${@dict.getType('inventoryStatus')}">
-                        <option th:each="dict : ${status}" th:text="${dict['dictLabel']}"
-                                th:value="${dict['dictValue']}"></option>
-                    </select>
-                </div>
-            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">重量：</label>
                 <div class="col-sm-8">
@@ -228,9 +218,6 @@
             adjustCode: {
                 required: true,
             },
-            problemType: {
-                required: true,
-            },
             materialCode: {
                 required: true,
             },
@@ -420,7 +420,7 @@
             $.modal.alertWarning("请至少选择一条记录");
             return;
         }
-        $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！"
+        $.modal.confirm("注意：该操作将更改库存数量或属性，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！"
             , function() {
                 var url = prefix + "/adjustEdit";
                 var data = { "ids": rows.join() };
@@ -99,7 +99,7 @@
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
     var prefix = ctx + "inventory/inventoryDetail";
-    var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
+    var inventoryStatus = [[${@dict.getType('inventorySts')}]];
     $(function () {
         update();
     });
@@ -158,7 +158,15 @@
                 },
                 {
                     field: 'qty',
-                    title: '数量'
+                    title: '库存数量'
+                },
+                {
+                    field: 'inventorySts',
+                    title: '库存状态',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(inventoryStatus, value);
+                    }
                 },
                 {
                     field: 'taskQty',
@@ -215,14 +223,6 @@
                     sortable: true,
                     visible: false
                 },
-                {
-                    field: 'inventorySts',
-                    title: '库存状态',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(inventoryStatus, value);
-                    }
-                },
  
                 {
                     field: 'referCode',
@@ -94,7 +94,7 @@
      <script th:inline="javascript">
          var editFlag = [[${@permission.hasPermi('inventoryHeader:inventoryTransaction:edit')}]];
          var prefix = ctx + "inventory/inventoryTransaction";
-         var inventoryStatus=[[${@dict.getType('inventoryStatus')}]];
+         var inventoryStatus=[[${@dict.getType('inventorySts')}]];
          var inventoryTransactionType = [[${@dict.getType('inventoryTransactionType')}]];
          $(function() {
              $("#bootstrap-table").bootstrapTable({
@@ -19,12 +19,6 @@
 					<input id="shipmentCode" name="shipmentCode" class="form-control" type="text" th:value="${shipmentCode}" readonly="readonly">
 				</div>
 			</div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">上游系统行号：</label>
-                <div class="col-sm-8">
-                    <input id="referLineNum" name="referLineNum" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
-                </div>
-            </div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">存货编码：</label>
 				<div class="col-sm-8">
@@ -32,6 +26,44 @@
 				</div>
 			</div>
 			<div class="form-group">
+				<label class="col-sm-3 control-label">库存状态：</label>
+				<div class="col-sm-8">
+					<select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
+						<option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">发货数量：</label>
+				<div class="col-sm-8">
+					<input id="shipQty" name="shipQty" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">批次：</label>
+				<div class="col-sm-8">
+					<input id="batch" name="batch" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">批号：</label>
+				<div class="col-sm-8">
+					<input id="lot" name="lot" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">项目号：</label>
+				<div class="col-sm-8">
+					<input id="projectNo" name="project" class="form-control" type="text">
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-3 control-label">上游系统行号：</label>
+				<div class="col-sm-8">
+					<input id="referLineNum" name="referLineNum" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
+				</div>
+			</div>
+			<div class="form-group">
 				<label class="col-sm-3 control-label">分配规则：</label>
 				<div class="col-sm-8">
 					<select id="allocationRule" class="form-control" th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('出库')}">
@@ -59,23 +91,6 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">批次：</label>
-				<div class="col-sm-8">
-					<input id="batch" name="batch" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">批号：</label>
-				<div class="col-sm-8">
-					<input id="lot" name="lot" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">项目号：</label>
-				<div class="col-sm-8">
-					<input id="projectNo" name="project" class="form-control" type="text">
-				</div>
-			</div>
 			<div class="form-group">	
 				<label class="col-sm-3 control-label">生产日期：</label>
 				<div class="col-sm-8">
@@ -88,20 +103,6 @@
 					<input id="expirationDate" name="expirationDate" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">库存状态：</label>
-				<div class="col-sm-8">
-                    <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
-                        <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
-                    </select>
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">发货数量：</label>
-				<div class="col-sm-8">
-					<input id="shipQty" name="shipQty" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
-				</div>
-			</div>
 			<div class="form-group">
 				<div class="form-control-static col-sm-offset-9">
 					<button type="submit" class="btn btn-primary">提交</button>
@@ -48,18 +48,6 @@
 					<input id="priority" name="priority" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">总数量：</label>
-				<div class="col-sm-8">
-					<input id="totalQty" name="totalQty" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">总行数：</label>
-				<div class="col-sm-8">
-					<input id="totalLines" name="totalLines" class="form-control" type="text">
-				</div>
-			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">要求到货时间：</label>
 				<div class="col-sm-8">
@@ -119,14 +107,7 @@
                 //     required:true,
                 //     digits:true,
                 // },
-                totalQty:{
-                    required:false,
-                    digits:true,
-                },
-                totalLines:{
-                    required:false,
-                    digits:true,
-                },
+
 			},
             submitHandler: function(form) {
                 $.ajax({
@@ -140,8 +121,6 @@
                         "referPlatform": $("input[name='referPlatform']").val(),
                         "customerCode": $("input[name='customerCode']").val(),
                         "priority": $("input[name='priority']").val(),
-                        "totalQty": $("input[name='totalQty']").val(),
-                        "totalLines": $("input[name='totalLines']").val(),
                         "requestedDeliveryDate": $("input[name='requestedDeliveryDate']").val(),
                     },
                     async: false,
@@ -158,7 +137,7 @@
         $(function () {
             layui.use('laydate', function() {
                 var laydate = layui.laydate;
-                laydate.render({ elem: '#appointmentTime',min: 0, theme: 'molv' ,type: 'datetime'});
+                laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss' });
             });
         })
 	</script>
@@ -175,9 +175,6 @@
                                 <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()"  shiro:hasPermission="shipment:bill:remove">
                                     <i class="fa fa-trash-o"></i> 删除
                                 </a>
-                                <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.edit(shipmentId)" shiro:hasPermission="shipment:bill:edit">
-                                    <i class="fa fa-edit"></i> 编辑主单据
-                                </a>
                                 <a class="btn btn-outline btn-default btn-rounded" onclick="loadDetail()">
                                     <i class="fa fa-refresh"></i> 刷新
                                 </a>
@@ -338,9 +335,6 @@
                         if (row.firstStatus < 100){
                             actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         }
-                        if (row.firstStatus < 120){
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
-                        }
                         return actions.join('');
                     }
                 }]
@@ -475,7 +469,6 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-<!DOCTYPE HTML>
-<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-shipmentHeaderHistory-add">
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">出库单编码：</label>
-				<div class="col-sm-8">
-					<input id="code" name="code" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">仓库id：</label>
-				<div class="col-sm-8">
-					<input id="warehouseId" name="warehouseId" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">仓库编码：</label>
-				<div class="col-sm-8">
-					<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">货主id：</label>
-				<div class="col-sm-8">
-					<input id="companyId" name="companyId" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">货主编码：</label>
-				<div class="col-sm-8">
-					<input id="companyCode" name="companyCode" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上游系统单号：</label>
-				<div class="col-sm-8">
-					<input id="sourceCode" name="sourceCode" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上游平台：</label>
-				<div class="col-sm-8">
-					<input id="sourcePlatform" name="sourcePlatform" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">出库单类型：</label>
-				<div class="col-sm-8">
-					<input id="type" name="type" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">客户编码：</label>
-				<div class="col-sm-8">
-					<input id="shipTo" name="shipTo" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">优先级：</label>
-				<div class="col-sm-8">
-					<input id="priority" name="priority" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">发货站台：</label>
-				<div class="col-sm-8">
-					<input id="station" name="station" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">总数量：</label>
-				<div class="col-sm-8">
-					<input id="totalQty" name="totalQty" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">总行数：</label>
-				<div class="col-sm-8">
-					<input id="totalLines" name="totalLines" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">备注：</label>
-				<div class="col-sm-8">
-					<input id="remark" name="remark" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上传备注：</label>
-				<div class="col-sm-8">
-					<input id="uploadremark" name="uploadremark" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上传时间：</label>
-				<div class="col-sm-8">
-					<input id="uploadTime" name="uploadTime" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">发货预约时间：</label>
-				<div class="col-sm-8">
-					<input id="appointmentTime" name="appointmentTime" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">单据头状态：</label>
-				<div class="col-sm-8">
-					<input id="firstStatus" name="firstStatus" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">单据尾状态：</label>
-				<div class="col-sm-8">
-					<input id="lastStatus" name="lastStatus" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上传状态：</label>
-				<div class="col-sm-8">
-					<input id="uploadStatus" name="uploadStatus" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">创建时间：</label>
-				<div class="col-sm-8">
-					<input id="created" name="created" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">创建用户：</label>
-				<div class="col-sm-8">
-					<input id="createdBy" name="createdBy" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">最后修改时间：</label>
-				<div class="col-sm-8">
-					<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">更新用户：</label>
-				<div class="col-sm-8">
-					<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">是否有效：</label>
-				<div class="col-sm-8">
-					<input id="enable" name="enable" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">是否删除：</label>
-				<div class="col-sm-8">
-					<input id="deleted" name="deleted" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">自定义字段1：</label>
-				<div class="col-sm-8">
-					<input id="userDef1" name="userDef1" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">自定义字段2：</label>
-				<div class="col-sm-8">
-					<input id="userDef2" name="userDef2" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">自定义字段3：</label>
-				<div class="col-sm-8">
-					<input id="userDef3" name="userDef3" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary">提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
-				</div>
-			</div>
-		</form>
-	</div>
-    <div th:include="include::footer"></div>
-    <script type="text/javascript">
-		var prefix = ctx + "shipment/shipmentHeaderHistory"
-		$("#form-shipmentHeaderHistory-add").validate({
-			rules:{
-				xxxx:{
-					required:true,
-				},
-			},
-			submitHandler: function(form) {
-				$.operate.save(prefix + "/add", $('#form-shipmentHeaderHistory-add').serialize());
-			}
-		});
-	</script>
-</body>
-</html>
-<!DOCTYPE HTML>
-<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-shipmentHeaderHistory-edit" th:object="${shipmentHeaderHistory}">
-            <input id="id" name="id" th:field="*{id}"  type="hidden">
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">出库单编码：</label>
-                <div class="col-sm-8">
-                    <input id="code" name="code" th:field="*{code}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">仓库id：</label>
-                <div class="col-sm-8">
-                    <input id="warehouseId" name="warehouseId" th:field="*{warehouseId}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">仓库编码：</label>
-                <div class="col-sm-8">
-                    <input id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">货主id：</label>
-                <div class="col-sm-8">
-                    <input id="companyId" name="companyId" th:field="*{companyId}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">货主编码：</label>
-                <div class="col-sm-8">
-                    <input id="companyCode" name="companyCode" th:field="*{companyCode}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">上游系统单号：</label>
-                <div class="col-sm-8">
-                    <input id="sourceCode" name="sourceCode" th:field="*{sourceCode}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">上游平台：</label>
-                <div class="col-sm-8">
-                    <input id="sourcePlatform" name="sourcePlatform" th:field="*{sourcePlatform}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">出库单类型：</label>
-                <div class="col-sm-8">
-                    <input id="type" name="type" th:field="*{type}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">客户编码：</label>
-                <div class="col-sm-8">
-                    <input id="shipTo" name="shipTo" th:field="*{shipTo}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">优先级：</label>
-                <div class="col-sm-8">
-                    <input id="priority" name="priority" th:field="*{priority}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">发货站台：</label>
-                <div class="col-sm-8">
-                    <input id="station" name="station" th:field="*{station}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">总数量：</label>
-                <div class="col-sm-8">
-                    <input id="totalQty" name="totalQty" th:field="*{totalQty}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">总行数：</label>
-                <div class="col-sm-8">
-                    <input id="totalLines" name="totalLines" th:field="*{totalLines}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">上传备注：</label>
-                <div class="col-sm-8">
-                    <input id="uploadremark" name="uploadremark" th:field="*{uploadremark}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">上传时间：</label>
-                <div class="col-sm-8">
-                    <input id="uploadTime" name="uploadTime" th:field="*{uploadTime}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">发货预约时间：</label>
-                <div class="col-sm-8">
-                    <input id="appointmentTime" name="appointmentTime" th:field="*{appointmentTime}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">单据头状态：</label>
-                <div class="col-sm-8">
-                    <input id="firstStatus" name="firstStatus" th:field="*{firstStatus}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">单据尾状态：</label>
-                <div class="col-sm-8">
-                    <input id="lastStatus" name="lastStatus" th:field="*{lastStatus}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">上传状态：</label>
-                <div class="col-sm-8">
-                    <input id="uploadStatus" name="uploadStatus" th:field="*{uploadStatus}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">创建时间：</label>
-                <div class="col-sm-8">
-                    <input id="created" name="created" th:field="*{created}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">创建用户：</label>
-                <div class="col-sm-8">
-                    <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">最后修改时间：</label>
-                <div class="col-sm-8">
-                    <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">更新用户：</label>
-                <div class="col-sm-8">
-                    <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">是否有效：</label>
-                <div class="col-sm-8">
-                    <input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">是否删除：</label>
-                <div class="col-sm-8">
-                    <input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">自定义字段1：</label>
-                <div class="col-sm-8">
-                    <input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">自定义字段2：</label>
-                <div class="col-sm-8">
-                    <input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">	
-                <label class="col-sm-3 control-label">自定义字段3：</label>
-                <div class="col-sm-8">
-                    <input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">
-                </div>
-            </div>
-			<div class="form-group">
-				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary">提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
-				</div>
-			</div>
-		</form>
-    </div>
-    <div th:include="include::footer"></div>
-    <script type="text/javascript">
-		var prefix = ctx + "shipment/shipmentHeaderHistory"
-		$("#form-shipmentHeaderHistory-edit").validate({
-			rules:{
-				xxxx:{
-					required:true,
-				},
-			},
-			submitHandler: function(form) {
-				$.operate.save(prefix + "/edit", $('#form-shipmentHeaderHistory-edit').serialize());
-			}
-		});
-	</script>
-</body>
-</html>
@@ -310,12 +310,6 @@
                         var actions = [];
                         actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
                        // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
-                        if (row.firstStatus < 100){
-                            actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        }
-                        if (row.firstStatus < 120){
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
-                        }
                         return actions.join('');
                     }
                 }]
@@ -449,8 +443,6 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
                         return actions.join('');
                     }
                 }]