wms / hhwms · Commits

Commit 493b0529c9e2e787a9717772ed735f7db6809e93

Authored by 周鸿
1 parent bea607da

fix：入库、出库导入功能完善；u8仓库页面；西厂立库；

Inline Side-by-side
Showing 10 changed files with 261 additions and 16 deletions
src/main/java/com/huaheng/pc/config/warehouse/controller/WarehouseU8Controller.java
  View file @493b052
1 1 package com.huaheng.pc.config.warehouse.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 6 import com.huaheng.common.redis.service.IRedisService;
5 7 import com.huaheng.common.utils.StringUtils;
6 8 import com.huaheng.common.utils.Wrappers;
... ... @@ -10,13 +12,17 @@ import com.huaheng.framework.aspectj.lang.annotation.Log;
10 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
11 13 import com.huaheng.framework.web.controller.BaseController;
12 14 import com.huaheng.framework.web.domain.AjaxResult;
  15 +import com.huaheng.framework.web.page.PageDomain;
13 16 import com.huaheng.framework.web.page.TableDataInfo;
  17 +import com.huaheng.framework.web.page.TableSupport;
14 18 import com.huaheng.pc.config.company.domain.Company;
15 19 import com.huaheng.pc.config.material.domain.Material;
  20 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
16 21 import com.huaheng.pc.config.warehouse.domain.WarehouseU8;
17 22 import com.huaheng.pc.config.warehouse.service.WarehouseU8Service;
18 23 import com.huaheng.pc.config.warehouse.domain.WorkOrderComponent;
19 24 import io.swagger.annotations.ApiOperation;
  25 +import org.apache.shiro.authz.annotation.RequiresPermissions;
20 26 import org.springframework.stereotype.Controller;
21 27 import org.springframework.transaction.annotation.Transactional;
22 28 import org.springframework.web.bind.annotation.GetMapping;
... ... @@ -39,6 +45,46 @@ public class WarehouseU8Controller extends BaseController {
39 45 @Resource
40 46 private IRedisService iRedisService;
41 47  
  48 + private String prefix = "config/warehouse";
  49 +
  50 + @RequiresPermissions("config:warehouse:view")
  51 + @GetMapping()
  52 + public String warehouse() {
  53 + return prefix + "/warehouseU8";
  54 + }
  55 +
  56 + /**
  57 + * 查询仓库列表
  58 + */
  59 + @RequiresPermissions("config:warehouse:list")
  60 + @Log(title = "配置-库存资料-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT)
  61 + @PostMapping("/list")
  62 + @ResponseBody
  63 + public TableDataInfo list(WarehouseU8 warehouse) {
  64 + LambdaQueryWrapper<WarehouseU8> lambdaQueryWrapper = Wrappers.lambdaQuery();
  65 + PageDomain pageDomain = TableSupport.buildPageRequest();// 分页
  66 + Integer pageNum = pageDomain.getPageNum();
  67 + Integer pageSize = pageDomain.getPageSize();
  68 + lambdaQueryWrapper
  69 + .eq(StringUtils.isNotEmpty(warehouse.getCompanyCode()), WarehouseU8::getCompanyCode, warehouse.getCompanyCode())
  70 + .eq(StringUtils.isNotEmpty(warehouse.getUCompanyCode()), WarehouseU8::getUCompanyCode,warehouse.getUCompanyCode())
  71 + .eq(StringUtils.isNotEmpty(warehouse.getUWarehouseCode()), WarehouseU8::getUWarehouseCode,warehouse.getUWarehouseCode())
  72 + .like(StringUtils.isNotEmpty(warehouse.getUWarehouseName()), WarehouseU8::getUWarehouseName,warehouse.getUWarehouseName())
  73 + .like(StringUtils.isNotEmpty(warehouse.getErpCode()), WarehouseU8::getErpCode,warehouse.getErpCode())
  74 + ;
  75 + /**
  76 + * 使用分页查询
  77 + */
  78 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  79 + Page<WarehouseU8> page = new Page<>(pageNum, pageSize);
  80 + IPage<WarehouseU8> iPage = warehouseWuService.page(page, lambdaQueryWrapper);
  81 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  82 + } else {
  83 + List<WarehouseU8> list = warehouseWuService.list(lambdaQueryWrapper);
  84 + return getDataTable(list);
  85 + }
  86 + }
  87 +
42 88 @ApiOperation("获取U8工单子件")
43 89 @Log(title = "获取U8工单子件", action = BusinessType.OTHER)
44 90 @GetMapping("/queryWorkOrders")
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryDomain.java
  View file @493b052
... ... @@ -42,5 +42,9 @@ public class InventoryDomain {
42 42 */
43 43 @Excel(name = "物料规格")
44 44 private String materialSpec;
45   -
  45 + /**
  46 + * T100仓库
  47 + */
  48 + @Excel(name = "T100仓库")
  49 + private String erpCode;
46 50 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
  View file @493b052
... ... @@ -540,16 +540,17 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
540 540 for (InventoryDomain inventoryDomain : inventoryDomainList) {
541 541 InventoryHeader inventoryHeader1 = new InventoryHeader();
542 542 try {
  543 + String erpCode=inventoryDomain.getErpCode();
543 544 //钱柜容器自动查找库位
544 545 String containerCode=inventoryDomain.getContainerCode();
545   - if(StringUtils.isNotEmpty(containerCode)&&(containerCode.startsWith("1")||containerCode.startsWith("2"))){
  546 + if(StringUtils.isNotEmpty(containerCode)){
546 547 Container container=containerService.getContainerByCode(containerCode,ShiroUtils.getWarehouseCode());
547 548 if(container!=null){
548 549 inventoryDomain.setLocationCode(container.getLocationCode());
549 550 }
550 551 }
551 552 // 检查容器 库位合法性
552   - checkLocationContainer(inventoryDomain.getLocationCode(),inventoryDomain.getContainerCode());
  553 +// checkLocationContainer(inventoryDomain.getLocationCode(),inventoryDomain.getContainerCode());
553 554  
554 555 LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
555 556 lambdaQueryWrapper.eq(InventoryHeader::getContainerCode, inventoryDomain.getContainerCode());
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
  View file @493b052
... ... @@ -80,6 +80,7 @@ public class ReceiptDetail implements Serializable {
80 80 private String uWarehouseCode;
81 81  
82 82 @TableField(value = "erpWarehouseCode")
  83 + @Excel(name = "erp仓库编码")
83 84 private String erpWarehouseCode;
84 85  
85 86  
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @493b052
... ... @@ -27,6 +27,7 @@ import com.huaheng.pc.config.receiptType.domain.ReceiptType;
27 27 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
28 28 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
29 29 import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
  30 +import com.huaheng.pc.config.warehouse.domain.WarehouseU8;
30 31 import com.huaheng.pc.config.warehouse.service.WarehouseU8Service;
31 32 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
32 33 import com.huaheng.pc.receipt.receiptDetail.mapper.ReceiptDetailMapper;
... ... @@ -653,7 +654,17 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
653 654 //过滤物料为空的数据
654 655 list = list.stream().filter(e -> StringUtils.isNotEmpty(e.getMaterialCode())).collect(Collectors.toList());
655 656 //新增入库头表
656   - ReceiptHeader receiptHeader = createHeader(operName, list);
  657 + String erpCode=list.get(0).getErpWarehouseCode();
  658 + String uwarehouseCode="";
  659 + String companyCode="";
  660 + if(StringUtils.isNotEmpty(erpCode)){
  661 + WarehouseU8 warehouseU8=warehouseU8Service.getWarehouseCode(ShiroUtils.getWarehouseCode(),erpCode);
  662 + if(warehouseU8!=null){
  663 + companyCode=warehouseU8.getCompanyCode();
  664 + uwarehouseCode=warehouseU8.getUWarehouseCode();
  665 + }
  666 + }
  667 + ReceiptHeader receiptHeader = createHeader(operName, list,companyCode,uwarehouseCode,erpCode);
657 668 int successNum = 0;
658 669 int failureNum = 0;
659 670 StringBuilder successMsg = new StringBuilder();
... ... @@ -706,7 +717,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
706 717 return successMsg.toString();
707 718 }
708 719  
709   - public ReceiptHeader createHeader(String operName, List<ReceiptDetail> list) {
  720 + public ReceiptHeader createHeader(String operName, List<ReceiptDetail> list,String companyCode,String uwarehosueCode,String erpCode) {
710 721 ReceiptHeader receiptHeader = new ReceiptHeader();
711 722 receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
712 723 String receipttype = QuantityConstant.RECEIPT_TYPE_PPI;
... ... @@ -725,6 +736,11 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
725 736 } else {
726 737 receiptHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
727 738 }
  739 + if(StringUtils.isNotEmpty(companyCode)){
  740 + receiptHeader.setCompanyCode(companyCode);
  741 + receiptHeader.setUWarehouseCode(uwarehosueCode);
  742 + receiptHeader.setErpWarehouseCode(erpCode);
  743 + }
728 744 receiptHeader.setCode(code);
729 745 receiptHeader.setReceiptType(receipttype);
730 746 receiptHeader.setTotalLines(list.size());
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
  View file @493b052
... ... @@ -335,6 +335,7 @@ public class ShipmentDetail implements Serializable {
335 335 private String uWarehouseCode;
336 336  
337 337 @TableField(value = "erpWarehouseCode")
  338 + @Excel(name = "erp仓库编码")
338 339 private String erpWarehouseCode;
339 340  
340 341 @TableField(exist = false)
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
  View file @493b052
... ... @@ -19,6 +19,7 @@ import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
19 19 import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
20 20 import com.huaheng.pc.config.statusFlow.service.StatusFlowHeaderService;
21 21 import com.huaheng.pc.config.warehouse.domain.Warehouse;
  22 +import com.huaheng.pc.config.warehouse.domain.WarehouseU8;
22 23 import com.huaheng.pc.config.warehouse.service.WarehouseService;
23 24 import com.huaheng.pc.config.warehouse.service.WarehouseU8Service;
24 25 import com.huaheng.pc.config.waveMaster.domain.WaveMaster;
... ... @@ -396,7 +397,17 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
396 397 if (StringUtils.isNull(list) || list.size() == 0) {
397 398 throw new BusinessException("导入数据不能为空！");
398 399 }
399   - ShipmentHeader shipmentHeader=createHeader(list);
  400 + String erpCode=list.get(0).getErpWarehouseCode();
  401 + String uwarehouseCode="";
  402 + String companyCode="";
  403 + if(StringUtils.isNotEmpty(erpCode)){
  404 + WarehouseU8 warehouseU8=warehouseU8Service.getWarehouseCode(ShiroUtils.getWarehouseCode(),erpCode);
  405 + if(warehouseU8!=null){
  406 + companyCode=warehouseU8.getCompanyCode();
  407 + uwarehouseCode=warehouseU8.getUWarehouseCode();
  408 + }
  409 + }
  410 + ShipmentHeader shipmentHeader=createHeader(list,companyCode,uwarehouseCode,erpCode);
400 411 int successNum = 0;
401 412 int failureNum = 0;
402 413 StringBuilder successMsg = new StringBuilder();
... ... @@ -431,6 +442,8 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
431 442  
432 443 importData.setWarehouseCode(shipmentHeader.getWarehouseCode());
433 444 importData.setCompanyCode(shipmentHeader.getCompanyCode());
  445 + importData.setUWarehouseCode(shipmentHeader.getUWarehouseCode());
  446 + importData.setErpWarehouseCode(shipmentHeader.getErpWarehouseCode());
434 447 // importData.setCompanyCode(QuantityConstant.COMPANY_CS);
435 448 importData.setInventorySts(QuantityConstant.GOOD);
436 449 this.save(importData);
... ... @@ -451,7 +464,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
451 464 }
452 465 return successMsg.toString();
453 466 }
454   - public ShipmentHeader createHeader(List<ShipmentDetail> list){
  467 + public ShipmentHeader createHeader(List<ShipmentDetail> list,String companyCode,String uwarehosueCode,String erpCode){
455 468 ShipmentHeader shipmentHeader=new ShipmentHeader();
456 469 String code =shipmentHeaderService.createCode(QuantityConstant.SHIPMENT_TYPE_PO,ShiroUtils.getWarehouseCode());
457 470 shipmentHeader.setId(null);
... ... @@ -465,6 +478,11 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
465 478 } else {
466 479 shipmentHeader.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
467 480 }
  481 + if(StringUtils.isNotEmpty(companyCode)){
  482 + shipmentHeader.setCompanyCode(companyCode);
  483 + shipmentHeader.setUWarehouseCode(uwarehosueCode);
  484 + shipmentHeader.setErpWarehouseCode(erpCode);
  485 + }
468 486 // shipmentHeader.setCompanyCode(QuantityConstant.COMPANY_CS);
469 487 shipmentHeader.setCode(code);
470 488 shipmentHeader.setShipmentType(QuantityConstant.SHIPMENT_TYPE_PO);
... ...
src/main/resources/templates/config/container/container.html
  View file @493b052
... ... @@ -141,12 +141,17 @@
141 141 title : 'U8仓库',
142 142 formatter: function(value, row, index) {
143 143 var actions = [];
144   - $.each(uWarehouseNames, function (index, dict) {
145   - if (dict.uWarehouseCode == value) {
146   - actions.push("<span >" + dict.uWarehouseName + "</span>");
147   - return false;
  144 + // $.each(uWarehouseNames, function (index, dict) {
  145 + // if (dict.uWarehouseCode == value) {
  146 + // actions.push("<span >" + dict.uWarehouseName + "</span>");
  147 + // return false;
  148 + // }
  149 + // });
  150 + for (let item of uWarehouseNames) {
  151 + if (item.companyCode == row.companyCode && item.uWarehouseCode == value) {
  152 + return item.uWarehouseName;
148 153 }
149   - });
  154 + }
150 155 return actions.join('');
151 156 }
152 157 },
... ...
src/main/resources/templates/config/warehouse/warehouseU8.html 0 → 100644
  View file @493b052
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="warehouse-form">
  10 + <div class="select-list">
  11 + <ul>
  12 +
  13 + <li>
  14 + 货主：
  15 + <select id="companyCode" name="companyCode"></select>
  16 +
  17 + </li>
  18 + <li>
  19 + U8仓库：<select id="uWarehouseCode" name="uWarehouseCode"></select>
  20 + </li>
  21 + <li>
  22 + erp编码：<input type="text" name="erpCode"/>
  23 + </li>
  24 + <li>
  25 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  26 + class="fa fa-search"></i>&nbsp;搜索</a>
  27 + <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('warehouse-form')"><i
  28 + class="fa fa-refresh"></i>&nbsp;重置</a>
  29 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="config:company:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  30 + </li>
  31 + </ul>
  32 + </div>
  33 + </form>
  34 + </div>
  35 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  36 +
  37 + <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:warehouse:remove">
  38 + <i class="fa fa-trash-o"></i> 删除
  39 + </a>-->
  40 + </div>
  41 +
  42 + <div class="col-sm-12 select-info">
  43 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  44 + </div>
  45 + </div>
  46 +</div>
  47 +<div th:include="include :: footer"></div>
  48 +<script th:inline="javascript">
  49 + var editFlag = [[${@permission.hasPermi('config:warehouse:edit')}]];
  50 + var removeFlag = [[${@permission.hasPermi('config:warehouse:remove')}]];
  51 + var prefix = ctx + "config/warehouseWu";
  52 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  53 + var company = [[${@companyService.getCode()}]];
  54 +
  55 + function initCompany() {
  56 + $("select[name='companyCode']").children().remove();
  57 + $("select[name='companyCode']").append(`<option value="">所有</option>`);
  58 + for (let item of company) {
  59 + let option = `<option value="${item.code}">${item.name}</option>`;
  60 + $("select[name='companyCode']").append(option);
  61 + }
  62 + }
  63 +
  64 + $(function () {
  65 + initCompany();
  66 + $("select[name='companyCode']").change(function (e) {
  67 + let companyCode = $("select[name='companyCode'] option:selected").val();
  68 + $.ajax({
  69 + url: ctx + "receipt/receiptHeader" + '/getwarehouse',
  70 + type: 'post',
  71 + data: {code: companyCode},
  72 + success: function (response) {
  73 + if (response.code === 200) {
  74 + $("select[name='uWarehouseCode']").children().remove();
  75 + $("select[name='uWarehouseCode']").append(`<option value="">所有</option>`);
  76 + for (let item of response.data) {
  77 + let option = `<option value="${item.uWarehouseCode}">${item.uWarehouseName}</option>`;
  78 + $("select[name='uWarehouseCode']").append(option);
  79 + }
  80 + } else {
  81 + $.modal.msgError(response.msg)
  82 + }
  83 + }
  84 + })
  85 + })
  86 + var options = {
  87 + url: prefix + "/list",
  88 + createUrl: prefix + "/add",
  89 + updateUrl: prefix + "/edit/{code}",
  90 + removeUrl: prefix + "/remove",
  91 + modalName: "u8仓库",
  92 + search: false,
  93 + columns: [{
  94 + checkbox: true
  95 + },
  96 + {
  97 + field: 'companyCode',
  98 + title: '货主编码'
  99 + },
  100 + {
  101 + field: 'uCompanyCode',
  102 + title: 'u8货主编码'
  103 + },
  104 + {
  105 + field: 'uWarehouseCode',
  106 + title: 'u8编码'
  107 + },
  108 + {
  109 + field: 'uWarehouseName',
  110 + title: '仓库名称'
  111 + },
  112 + {
  113 + field: 'erpCode',
  114 + title: 'erp编码'
  115 + },
  116 +
  117 +
  118 + // {
  119 + // title: '操作',
  120 + // align: 'center',
  121 + // formatter: function (value, row, index) {
  122 + // var actions = [];
  123 + // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick= edit(\'' + row.code + '\')><i class="fa fa-edit"></i>编辑</a> ');
  124 + // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick=removes(\'' + row.code + '\')><i class="fa fa-trash-o"></i>删除</a>');
  125 + // return actions.join('');
  126 + // }
  127 + // }
  128 + ]
  129 + };
  130 + $.table.init(options);
  131 + });
  132 +
  133 + function edit(code) {
  134 + var url = prefix + "/edit/" + code;
  135 + $.modal.open("修改" + table.options.modalName, url);
  136 + }
  137 +
  138 + // 删除信息
  139 + function removes(code) {
  140 + $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function () {
  141 + var url = $.common.isEmpty(code) ? table.options.removeUrl : table.options.removeUrl.replace("{code}", code);
  142 + var data = {"codes": code};
  143 + $.operate.submit(url, "post", "json", data);
  144 + });
  145 + }
  146 +
  147 + function copy() {
  148 + var url = prefix + "/copy";
  149 + $.modal.open("复制仓库" + table.options.modalName, url);
  150 + }
  151 +</script>
  152 +</body>
  153 +</html>
0 154 \ No newline at end of file
... ...
src/main/resources/templates/task/taskHeader/taskHeaderV.html
  View file @493b052
... ... @@ -254,7 +254,7 @@
254 254 actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
255 255 if (row.status < 10) {
256 256 //判断LK，AGV，XC，JLk
257   - if (row.zoneCode == 'LK' || row.zoneCode === "AGV" || row.zoneCode === "XC"||row.zoneCode === "JLK") {
  257 + if (row.zoneCode == 'LK' || row.zoneCode === "AGV" || row.zoneCode === "JLK") {
258 258 //补充入，整盘出，分拣出，空托出，盘点,出库查看
259 259 if ((row.taskType == 200 || row.taskType == 300 || row.taskType == 400 || row.taskType == 600 || row.taskType == 700 || row.taskType == 900) && !row.port) {
260 260 if (row.warehouseCode == 'CS0001' && (row.taskType == 300 || row.taskType == 600) && row.containerCode.substring(0, 1) == "M" && !row.port) {
... ... @@ -285,7 +285,7 @@
285 285 actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="#" onclick="setLKPort(\'' + row.id + '\')"><i class="fa fa-check"></i>分配站台</a>');
286 286 }
287 287 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
288   - if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC" || row.zoneCode === "JLK"))) {
  288 + if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "JLK"))) {
289 289 } else if (row.warehouseCode == 'XZ0001' && row.zoneCode == 'LK') {
290 290 } else if (row.warehouseCode == 'CS0001' && row.zoneCode == 'LK') {
291 291 } else {
... ... @@ -300,14 +300,14 @@
300 300 // }
301 301 if (row.status >= 10 && row.status < 100) {
302 302 //昆山要求任务下发后不能取消任务，怕库存乱
303   - if (row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV'||row.zoneCode == 'JLK' || row.zoneCode === "XC"|| row.zoneCode === "J")) {
  303 + if (row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode == 'JLK' || row.zoneCode === "J")) {
304 304 } else if (row.warehouseCode == 'XZ0001' && (row.zoneCode == 'QG' || row.zoneCode == 'LK')) {
305 305 } else if (row.warehouseCode == 'CS0001' && row.zoneCode == 'V' ) {
306 306 }else {
307 307 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
308 308 }
309 309 //
310   - if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "XC" || row.zoneCode === "JLK"))) {
  310 + if ((row.warehouseCode == 'KS0001' && (row.zoneCode == 'LK' || row.zoneCode == 'AGV' || row.zoneCode === "JLK"))) {
311 311 if (row.zoneCode == "LK" && row.taskType == 300) {
312 312 actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
313 313 }
... ...