From 11c553c2990150779e8aba794a55a05ca660c5b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 08 十月 2024 17:01:06 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 13 +-
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 6 +
src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml | 3
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 124 ++++++++++++++++++++++++++++++
src/main/webapp/static/js/pakStore/crnLocCheckOut.js | 17 +++-
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2
src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java | 12 ++
src/main/webapp/views/pakStore/crnLocCheckOut.html | 8 +
src/main/webapp/static/js/wrkMast/wrkMast.js | 1
src/main/java/com/zy/asrs/controller/WorkController.java | 27 ++++++
src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java | 21 +++++
11 files changed, 219 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 94d443d..7afaeab 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -26,6 +26,12 @@
@Autowired
private InventoryCheckOrderService inventoryCheckOrderService;
+ @RequestMapping("/inventoryCheckOrder/select/status/1")
+ @ManagerAuth()
+ public R availableTakeCheckSite(){
+ return R.ok().add(inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", "1")));
+ }
+
@RequestMapping(value = "/inventoryCheckOrder/nav/list/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
index 09b3b8d..0c48f3c 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.zy.asrs.entity.InventoryCheckOrder;
import com.zy.asrs.entity.InventoryCheckOrderDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.InventoryCheckOrderDetlService;
@@ -13,6 +14,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,15 +26,23 @@
@Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ @Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
@RequestMapping(value = "/inventoryCheckOrderDetl/pakout/list/auth")
@ManagerAuth
public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+ if (null == param.get("order_id")|| param.get("order_id").equals("9999999999")){
+ return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no",null)));
+ }
+ InventoryCheckOrder inventoryCheckOrder = inventoryCheckOrderService.selectById(Integer.parseInt(param.get("order_id").toString()));
+
EntityWrapper<InventoryCheckOrderDetl> inventoryCheckOrderDetlEntityWrapper = new EntityWrapper<>();
// convert(param, inventoryCheckOrderDetlEntityWrapper);
- inventoryCheckOrderDetlEntityWrapper.eq("order_no",param.get("order_id"));
+ inventoryCheckOrderDetlEntityWrapper.eq("order_no",inventoryCheckOrder.getOrderNo());
+
return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), inventoryCheckOrderDetlEntityWrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 0d8a021..2425145 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,14 +1,17 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
@@ -34,6 +37,8 @@
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private StaDescService staDescService;
@RequestMapping("/available/put/site")
@ManagerAuth()
@@ -74,6 +79,28 @@
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
+ @RequestMapping("/available/take/check/site/crn")
+ @ManagerAuth()
+ public R availableTakeCheckSiteCrn(){
+ EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
+ staDescEntityWrapper.eq("type_no",107);
+ staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
+ staDescEntityWrapper.in("crn_no",1,2,3,4,5,6,7);
+ return R.ok().add(staDescService.selectList(staDescEntityWrapper));
+ }
+
+ @RequestMapping("/available/take/check/site/ctu")
+ @ManagerAuth()
+ public R availableTakeCheckSiteCtu(){
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
+ }
+
+ @RequestMapping("/available/take/check/site/shuttle")
+ @ManagerAuth()
+ public R availableTakeCheckSiteShuttle(){
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
+ }
+
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
index 722c3af..9e3f267 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
@@ -42,8 +42,15 @@
private String area;
@ApiModelProperty(value= "")
+ private String status;
+
+ @ApiModelProperty(value= "")
@TableField("loc_no")
private String locNo;
+
+ @ApiModelProperty(value= "")
+ @TableField("check_anfme")
+ private String checkAnfme;
@ApiModelProperty(value= "")
@TableField("io_time")
@@ -81,5 +88,19 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getStatus$(){
+ if (Cools.isEmpty(this.status)){
+ return "";
+ }
+ switch (this.status){
+ case "1":
+ return "寰呯洏";
+ case "2":
+ return "宸茬洏";
+ default:
+ return "";
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 331d3b0..464b46c 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -13,6 +13,8 @@
// 鍑虹珯鍙�
private Integer outSite;
+ private String orderNo;
+
// 鐗╂枡缂栧彿闆嗗悎
private List<LocDetl> locDetls;
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2cd2b9b..f494efc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -77,6 +77,8 @@
private SlaveProperties slaveProperties;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Override
@Transactional
@@ -254,6 +256,126 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(detlDto.getLocDetl());
+ wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
+ wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ }
+
+ @Transactional
+ public void inventoryCheckStockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId,StockOutParam param) {
+ Date now = new Date();
+ // 鍚堝苟鍚岀被椤�
+ Set<String> locNos = new HashSet<>();
+ List<OutLocDto> dtos = new ArrayList<>();
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+ String locNo = locDetlDto.getLocDetl().getLocNo();
+ if (locNos.contains(locNo)) {
+ for (OutLocDto dto : dtos) {
+ if (dto.getLocNo().equals(locNo)) {
+ dto.getLocDetlDtos().add(locDetlDto);
+ break;
+ }
+ }
+ } else {
+ locNos.add(locNo);
+ dtos.add(new OutLocDto(locNo, locDetlDto));
+ }
+ }
+ Integer ioType = null;
+ // 鐢熸垚宸ヤ綔妗�
+ for (OutLocDto dto : dtos) {
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ if (ioWorkType == null) {
+ ioType = dto.isAll() ? 101 : 103;
+ } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
+ ioType = 107;
+ }
+ assert ioType != null;
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+
+ Integer outSta = staNo.getDevNo();
+// //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
+// if(locMast.getCrnNo()==2){
+// outSta = ioType == 101 ? 204 : 202;
+// }
+
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (ioType == 107){
+ wrkMast.setSheetNo(param.getOrderNo());
+ }
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+
+ InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl();
+ inventoryCheckOrderDetl.setOrderNo(param.getOrderNo());
+ inventoryCheckOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr());
+ inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());
+ inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch());
+ inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());
+ inventoryCheckOrderDetl.setArea(wrkMast.getCrnNo$());
+ inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());
+ inventoryCheckOrderDetl.setIoTime(now);
+ inventoryCheckOrderDetl.setStatus("1");
+ if (!inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl)) {
+ throw new CoolException("淇濆瓨鐩樼偣鏄庣粏澶辫触");
+ }
+
if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(detlDto.getLocDetl());
@@ -571,7 +693,7 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if (locMast.getLocSts().equals("F")){
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
- stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
+ inventoryCheckStockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId,param);
}else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
}
diff --git a/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml b/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml
index 7fa44c8..25960c8 100644
--- a/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml
+++ b/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml
@@ -13,7 +13,8 @@
<result column="area" property="area" />
<result column="loc_no" property="locNo" />
<result column="io_time" property="ioTime" />
-
+ <result column="status" property="status" />
+ <result column="check_anfme" property="checkAnfme" />
</resultMap>
</mapper>
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index 7cac188..0035a85 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -32,13 +32,14 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'checkAnfme', align: 'center',title: '鐩樼偣鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
- ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+ // ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -48,13 +49,13 @@
// ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
// ,{field: 'count', align: 'center',title: '鏁伴噺'}
// ,{field: 'weight', align: 'center',title: '閲嶉噺'}
- // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/pakStore/crnLocCheckOut.js b/src/main/webapp/static/js/pakStore/crnLocCheckOut.js
index 7d4ad83..64d2a0a 100644
--- a/src/main/webapp/static/js/pakStore/crnLocCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/crnLocCheckOut.js
@@ -32,6 +32,7 @@
tableMerge.render(this);
limit();
getOutBound();
+ getOutBoundOrder();
}
});
@@ -42,6 +43,11 @@
if (locDetlData.length === 0){
layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
} else {
+ var orderNo = $("#orderSelect").val();
+ if (orderNo === "" || orderNo === null){
+ layer.msg("璇烽�夋嫨鐩樼偣鍗�", {icon: 2});
+ return;
+ }
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
@@ -49,7 +55,8 @@
}
let param = {
outSite: staNo,
- locDetls: locDetlData
+ locDetls: locDetlData,
+ orderNo: orderNo
}
$.ajax({
url: baseUrl+"/locCheck/out/start",
@@ -77,7 +84,7 @@
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
$.ajax({
- url: baseUrl+"/available/take/check/site",
+ url: baseUrl+"/available/take/check/site/crn",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
@@ -100,16 +107,16 @@
// 鑾峰彇鍑哄簱鍙�
function getOutBoundOrder(){
$.ajax({
- url: baseUrl+"/available/take/check/site",
+ url: baseUrl+"/inventoryCheckOrder/select/status/1",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
success: function (res) {
if (res.code === 200){
- var tpl = $("#takeSiteSelectTemplate").html();
+ var tpl = $("#orderSelectTemplate").html();
var template = Handlebars.compile(tpl);
var html = template(res);
- $('#staNoSelect').append(html);
+ $('#orderSelect').append(html);
form.render('select');
} else if (res.code === 403){
top.location.href = baseUrl+"/";
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..2028ec7 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -31,6 +31,7 @@
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'sheetNo', align: 'center',title: '鍗曟嵁'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
diff --git a/src/main/webapp/views/pakStore/crnLocCheckOut.html b/src/main/webapp/views/pakStore/crnLocCheckOut.html
index f83b672..30ab2cb 100644
--- a/src/main/webapp/views/pakStore/crnLocCheckOut.html
+++ b/src/main/webapp/views/pakStore/crnLocCheckOut.html
@@ -126,7 +126,13 @@
<script type="text/template" id="takeSiteSelectTemplate">
{{#each data}}
- <option value="{{this}}">{{this}}</option>
+ <option value="{{stnNo}}">{{stnNo}}</option>
+ {{/each}}
+</script>
+
+<script type="text/template" id="orderSelectTemplate">
+ {{#each data}}
+ <option value="{{orderNo}}">{{orderNo}}</option>
{{/each}}
</script>
--
Gitblit v1.9.1