From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 18
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/webapp/static/js/pakStore/stockOut0.js | 20
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 4
src/main/java/com/zy/common/properties/SystemProperties.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 14 +
src/main/webapp/static/js/matStore/matStore.js | 1
src/main/webapp/views/pakStore/locDetlQuery.html | 4
src/main/java/com/zy/asrs/service/MatOutService.java | 2
src/main/webapp/static/js/wrkMast/wrkMast.js | 18
src/main/webapp/static/js/stoMan/stoQue.js | 16
pom.xml | 9
src/main/webapp/views/locDetl/locDetl_detail.html | 6
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/views/wrkDetl/wrkDetl_detail.html | 8
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 98 ++++----
src/main/webapp/views/pda/stockOut.html | 8
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 18
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 6
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 20
src/main/java/com/zy/asrs/service/LocDetlService.java | 12 +
src/main/webapp/static/js/matOut/matOut.js | 39 +--
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4
src/main/webapp/static/js/pakStore/stockAdjust.js | 28 +-
src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html | 6
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 14 +
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/webapp/static/js/pakStore/stockOut.js | 20
src/main/webapp/views/pda/locDetlIframe.html | 10
src/main/webapp/static/js/locDetl/locDetl.js | 18
src/main/webapp/views/waitPakin/waitPakin_detail.html | 6
src/main/webapp/static/js/waitPakin/waitPakin.js | 6
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 4
src/main/java/com/zy/ints/controller/WaitMatinController.java | 1
src/main/webapp/views/pakStore/locDetlQuery0.html | 4
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 18
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js | 21 +
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 6
src/main/webapp/views/pda/stockQuery.html | 8
src/main/webapp/views/waitMatin/waitMatin.html | 114 ++++------
41 files changed, 320 insertions(+), 299 deletions(-)
diff --git a/pom.xml b/pom.xml
index b52ca42..166cf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,15 @@
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>3.3.4</version>
</dependency>
+
+
+ <!--Lombok-->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.14</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a4b00a5..fa4279c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -38,7 +38,7 @@
return R.ok(locDetlService.selectById(String.valueOf(id)));
}
- @RequestMapping(value = "/locDetl/auth")
+ @GetMapping(value = "/locDetl/auth")
@ManagerAuth
public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
if (!locNos.isEmpty()) {
@@ -177,4 +177,6 @@
return R.ok();
}
+
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 581886d..c71915a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
@@ -27,4 +28,7 @@
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.mat_no = #{matNo} AND lm.loc_sts = 'F' AND DateDiff(dd, lm.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(String matNo);
+ List<LocDetl> selectLocDetlList(@Param("mat_no") String matNo);
+
+ Double selectLocDetlSumQty(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index fb200f9..15aff8a 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -24,4 +24,16 @@
*/
List<String> getSameDetlToday(String matNo);
+ /**
+ *
+ * @param matNo 浜у搧鍙�
+ * @return kuwei
+ */
+ List<LocDetl> getlocDetlList(String matNo);
+
+ /**
+ * 鏌ヨ搴撲綅璇︽儏涓殑浜у搧鏁伴噺
+ * @return
+ */
+ Double getLocDetlSumQty(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/MatOutService.java b/src/main/java/com/zy/asrs/service/MatOutService.java
index 04031f0..55de81d 100644
--- a/src/main/java/com/zy/asrs/service/MatOutService.java
+++ b/src/main/java/com/zy/asrs/service/MatOutService.java
@@ -20,5 +20,5 @@
* @param locDetls 寰呭嚭搴撲骇鍝�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, Integer ioType, Long userId);
+ void stockOut(BasDevp staNo, LocDetlDto locDetls, Integer ioType, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 4c8bb41..823655b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -6,12 +6,16 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
@@ -40,4 +44,14 @@
return this.baseMapper.selectSameDetlToday(matNo);
}
+ @Override
+ public List<LocDetl> getlocDetlList(String matNo) {
+ return locDetlMapper.selectLocDetlList(matNo);
+ }
+
+ @Override
+ public Double getLocDetlSumQty(String locNo) {
+ return locDetlMapper.selectLocDetlSumQty(locNo);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
index 8bc2e2c..3747006 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -11,6 +11,9 @@
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.service.CommonService;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.mapper.WaitMatoutMapper;
+import com.zy.ints.service.WaitMatoutService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,58 +41,61 @@
private WrkDetlService wrkDetlService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WaitMatoutMapper waitMatoutMapper;
+ @Autowired
+ private WaitMatoutService waitMatoutService;
@Override
@Transactional
public void startupMatOut(StockOutParam param, Long userId){
+
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatNo(), paramLocDetl.getCount())) {
- LocDetl sqlParam = new LocDetl();
- sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatNo(paramLocDetl.getMatNo());
- LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
+ if (!Cools.isEmpty(paramLocDetl.getMatNo())) {
+ //鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
+ List<LocDetl> locDetls=locDetlService.getlocDetlList(paramLocDetl.getMatNo());
+ for (LocDetl locDetl : locDetls) {
+ WaitMatout waitMatout = waitMatoutService.selectOne(new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo()).eq("seq_no",paramLocDetl.getSeqNo()));
+ Double outQty = paramLocDetl.getCount() - waitMatout.getOutQty();
+ if(waitMatout.getOutQty() >= waitMatout.getQty()){
+ break;
+ }
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ Double sumCount=locDetlService.getLocDetlSumQty(locDetl.getLocNo());
+ int ioType=0;
+ ioType=sumCount-outQty>0?103 : 101;
+
+ if (outQty >= locDetl.getQty()){
+ //鐢熸垚鏂囨。璁板綍
+ stockOut(staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+ waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
+ //淇敼璁板綍
+ Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+ .eq("seq_no",paramLocDetl.getSeqNo()));
+ }else {
+ //鐢熸垚鏂囨。璁板綍
+ stockOut(staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+ waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
+ //淇敼璁板綍
+ Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+ .eq("seq_no",paramLocDetl.getSeqNo()));
+ }
+ }
}
- }
- if (!locDetlDtos.isEmpty()) {
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
- } else {
- throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
}
}
@Override
@Transactional
- public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {
- // 鍚堝苟鍚岀被椤�
- Set<String> locNos = new HashSet<>();
- locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
- List<OutLocDto> dtos = new ArrayList<>();
- for (String locNo : locNos) {
- List<LocDetlDto> list = new ArrayList<>();
- Iterator<LocDetlDto> iterator = locDetlDtos.iterator();
- while (iterator.hasNext()) {
- LocDetlDto dto = iterator.next();
- if (locNo.equals(dto.getLocDetl().getLocNo())) {
- list.add(dto);
- iterator.remove();
- }
- }
- dtos.add(new OutLocDto(locNo, list));
- }
+ public void stockOut(BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
// 鐢熸垚宸ヤ綔妗�
- for (OutLocDto dto : dtos) {
- // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- if (ioType == null) {
- ioType = dto.isAll() ? 101 : 103;
- }
+ LocDetl locDetl=locDetlDtos.getLocDetl();
// 鑾峰彇搴撲綅
- LocMast locMast = locMastService.selectById(dto.getLocNo());
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
@@ -111,7 +117,7 @@
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setSourceLocNo(locDetl.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -122,18 +128,15 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(new Date());
if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locDetl.getLocNo());
}
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
// 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
- if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
+ if (locDetlDtos.getCount()==null || locDetlDtos.getCount() <= 0.0D) {return;}
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- Double qty = ioType==101?detlDto.getLocDetl().getQty():detlDto.getCount();
- wrkDetl.setQty(qty); // 鏁伴噺
- VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 鐗堟湰鎺у埗
+ wrkDetl.setQty(locDetlDtos.getCount()); // 鏁伴噺
+ VersionUtils.setWrkDetl(wrkDetl, locDetlDtos.getLocDetl()); // 鐗堟湰鎺у埗
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
@@ -141,20 +144,17 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- }
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.selectById(dto.getLocNo());
+ locMast = locMastService.selectById(locDetl.getLocNo());
if (locMast.getLocSts().equals("F")) {
locMast.setLocSts(ioType==101?"R":"P");
locMast.setModiUser(userId);
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locDetl.getLocNo());
}
} else {
- throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
- }
-
}
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 8aaa8ef..a88370d 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2020-08-01 17:48:35";
+ String timeStr = "2023-08-01 17:48:35";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index d88267f..5b51cb4 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.entity.KeyValueVo;
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 6551419..66f1960 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -69,4 +69,18 @@
and b.loc_sts = 'F'
<include refid="stockOutCondition"></include>
</select>
+
+ <select id="selectLocDetlList" resultMap="BaseResultMap">
+ select a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F' and a.mat_no= #{mat_no}
+ order by a.appe_time
+ </select>
+ <select id="selectLocDetlSumQty" resultType="double">
+ select SUM(qty) qty
+ from asr_loc_detl
+ where loc_no=#{locNo}
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index 12b3308..7185f5a 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -359,15 +359,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
- ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'size', align: 'center',title: '灏哄'}
- ,{field: 'color', align: 'center',title: '棰滆壊'}
- // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
+ ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
+ ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 30993af..686640d 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -355,15 +355,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
- ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'size', align: 'center',title: '灏哄'}
- ,{field: 'color', align: 'center',title: '棰滆壊'}
- // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+ ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 05959a4..eca2026 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -212,7 +212,7 @@
layer.getChildFrame('#data-detail-submit-save', index).hide();
setFormVal(layer.getChildFrame('#detail', index), data, false);
top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('#locNo,#matNo', index), true);
+ top.convertDisabled(layer.getChildFrame('#locNo,#matnr', index), true);
layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
layero.find('iframe')[0].contentWindow.layui.form.render('select');
layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
@@ -352,15 +352,15 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- specs: $('#specs').val(),
- size: $('#size').val(),
- color: $('#color').val(),
+ matnr: $('#matnr').val(),
+ lgnum: $('#lgnum').val(),
+ tbnum: $('#tbnum').val(),
+ tbpos: $('#tbpos').val(),
zmatid: $('#zmatid').val(),
- // werks: $('#werks').val(),
- qty: $('#qty').val(),
- unit: $('#unit').val(),
+ maktx: $('#maktx').val(),
+ werks: $('#werks').val(),
+ anfme: $('#anfme').val(),
+ altme: $('#altme').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/matOut/matOut.js b/src/main/webapp/static/js/matOut/matOut.js
index c5be543..4680b8f 100644
--- a/src/main/webapp/static/js/matOut/matOut.js
+++ b/src/main/webapp/static/js/matOut/matOut.js
@@ -2,15 +2,19 @@
var locDetlData = [];
function getCol() {
var cols = [
- {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
+ // {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ // ,
+ {field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80}
,{field: 'qty', title:'閫氱煡鍑哄簱閲�', align: 'center'}
,{field: 'outQty', title:'宸插嚭搴撻噺', align: 'center'}
];
arrRemove(detlCols, 'field', 'qty');
cols.push.apply(cols, detlCols);
- // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push(
+ {field: 'memo', title:'澶囨敞', align: 'center'},
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ )
return cols;
}
@@ -36,7 +40,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.billNo, obj.data.seqNo, obj.data.matNo, Number(obj.value));
+ updateLocDetlData( obj.data.billNo, obj.data.seqNo, obj.data.matNo, obj.data.qty);
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,10 +56,10 @@
layer.msg("璇烽�夋嫨鍑哄簱鍙�");
return;
}
- debugger
+
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({billNo:elem.billNo, seqNo:elem.seqNo, matNo: elem.matNo, count: elem.count});
+ locDetls.push({billNo:elem.billNo,seqNo:elem.seqNo, matNo: elem.matNo, count: elem.count});
});
let param = {
outSite: staNo,
@@ -90,7 +94,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].billNo === data.billNo && locDetlData[i].seqNo === data.seqNo) {
+ if (locDetlData[i].seqNo === data.seqNo && locDetlData[i].matNo === data.matNo) {
locDetlData.splice(i, 1);
}
}
@@ -99,27 +103,6 @@
}
});
- function updateLocDetlData(billNo, seqNo, matNo, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["billNo"] === billNo && locDetlData[i]["seqNo"] === seqNo){
- if (count > locDetlData[i]["qty"]) {
- layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
- } else {
- locDetlData[i]["count"] = count;
- }
- break;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
- }
- }
- tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
- }
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
diff --git a/src/main/webapp/static/js/matStore/matStore.js b/src/main/webapp/static/js/matStore/matStore.js
index da52595..657151f 100644
--- a/src/main/webapp/static/js/matStore/matStore.js
+++ b/src/main/webapp/static/js/matStore/matStore.js
@@ -160,6 +160,7 @@
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if(count > (qty-inQty) ){
+ count.html(59)
layer.msg("鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍙叆搴撻噺");
}
if (count > 0) {
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index da06c6e..f2840c3 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -31,7 +31,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -49,8 +49,8 @@
}
var locDetls = [];
data.forEach(function(elem) {
- // locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matNo: elem.matNo});
+ // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
+ locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
});
let param = {
outSite: staNo,
@@ -85,7 +85,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
locDetlData.splice(i, 1);
}
}
@@ -94,14 +94,14 @@
}
});
- function updateLocDetlData(locNo, matNo, count) {
+ function updateLocDetlData(locNo, matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
- if (count > locDetlData[i]["qty"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
+ if (count > locDetlData[i]["anfme"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -160,7 +160,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -168,7 +168,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["qty"];
+ data[i]["count"] = data[i]["anfme"];
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 970f9d8..8a429d3 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -5,9 +5,9 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
- arrRemove(detlCols, "field", "qty")
+ arrRemove(detlCols, "field", "anfme")
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -35,7 +35,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -94,7 +94,7 @@
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matnr === data.matnr) {
matCodeData.splice(i, 1);
}
}
@@ -124,7 +124,7 @@
matCodeData = [];
let data = res.data.records;
for (var i = 0; i<data.length; i++) {
- data[i]["count"] = data[i].qty;
+ data[i]["count"] = data[i].anfme;
data[i]["removeBtn"] = false;
matCodeData.push(data[i]);
}
@@ -174,13 +174,13 @@
}
}
- function updateMatCodeData(matNo, count) {
+ function updateMatCodeData(matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ if (matCodeData[i]["matnr"] === matnr){
matCodeData[i]["count"] = count;
}
}
@@ -228,7 +228,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matNo) {
+ if (data[i].matNo === matCodeData[j].matnr) {
pass = true;
break;
}
@@ -238,12 +238,12 @@
count: initCountVal,
anfme: initAnfmeVal,
removeBtn: true,
- matNo: data[i].matNo,
- matName: data[i].matName,
- specs: data[i].specs,
- size: data[i].size,
- unit: data[i].unit,
- color: data[i].color,
+ matnr: data[i].matNo,
+ maktx: data[i].matName,
+ lgnum: data[i].str2,
+ color: data[i].str3,
+ bname: data[i].str4,
+ altme: data[i].str1,
})
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 2cf0862..6c08a87 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -3,10 +3,10 @@
function getCol() {
var cols = [
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- {field: 'qty', align: 'center',title: '鏁伴噺'}
+ {field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
- arrRemove(detlCols, 'field', 'qty');
+ arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
// cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -34,7 +34,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,7 +52,7 @@
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
});
let param = {
outSite: staNo,
@@ -87,7 +87,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
locDetlData.splice(i, 1);
}
}
@@ -96,14 +96,14 @@
}
});
- function updateLocDetlData(locNo, matNo, count) {
+ function updateLocDetlData(locNo, matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
- if (count > locDetlData[i]["qty"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
+ if (count > locDetlData[i]["anfme"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -162,7 +162,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -170,7 +170,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["qty"];
+ data[i]["count"] = data[i]["anfme"];
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut0.js b/src/main/webapp/static/js/pakStore/stockOut0.js
index 5d79121..0d05eb9 100644
--- a/src/main/webapp/static/js/pakStore/stockOut0.js
+++ b/src/main/webapp/static/js/pakStore/stockOut0.js
@@ -3,10 +3,10 @@
function getCol() {
var cols = [
{field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- ,{field: 'qty', align: 'center',title: '鍘熸暟閲�'}
+ ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
- arrRemove(detlCols, 'field', 'qty');
+ arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -34,7 +34,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
+ updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,7 +52,7 @@
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
});
let param = {
outSite: staNo,
@@ -87,7 +87,7 @@
switch (obj.event) {
case 'remove':
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
locDetlData.splice(i, 1);
}
}
@@ -96,14 +96,14 @@
}
});
- function updateLocDetlData(locNo, matNo, count) {
+ function updateLocDetlData(locNo, matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
- if (count > locDetlData[i]["qty"]) {
+ if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
+ if (count > locDetlData[i]["anfme"]) {
layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
} else {
locDetlData[i]["count"] = count;
@@ -162,7 +162,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -170,7 +170,7 @@
if (pass) {
data.splice(i--, 1);
} else {
- data[i]["count"] = data[i]["qty"];
+ data[i]["count"] = data[i]["anfme"];
}
}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index c8f0de3..8c946b5 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -201,15 +201,15 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
- ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'size', align: 'center',title: '灏哄'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
+ ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- ,{field: 'color', align: 'center',title: '棰滆壊'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
+ ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
]],
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 0320130..ef7f164 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -319,9 +319,9 @@
// id: $('#id').val(),
id: $('#id').val(),
barcode: $('#barcode').val(),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- qty: $('#qty').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ anfme: $('#anfme').val(),
unit: $('#unit').val(),
status: $('#status').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 69e2e52..54fc129 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -319,9 +319,9 @@
id: $('#id').val(),
pakinId: $('#pakinId').val(),
barcode: $('#barcode').val(),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- qty: $('#qty').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ anfme: $('#anfme').val(),
unit: $('#unit').val(),
status: $('#status').val(),
memo: $('#memo').val(),
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 5309096..9aad5bf 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -322,15 +322,15 @@
// id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- specs: $('#specs').val(),
- size: $('#size').val(),
- color: $('#color').val(),
- // zmatid: $('#zmatid').val(),
- // werks: $('#werks').val(),
- qty: $('#qty').val(),
- unit: $('#unit').val(),
+ matnr: $('#matnr').val(),
+ lgnum: $('#lgnum').val(),
+ tbnum: $('#tbnum').val(),
+ tbpos: $('#tbpos').val(),
+ zmatid: $('#zmatid').val(),
+ maktx: $('#maktx').val(),
+ werks: $('#werks').val(),
+ anfme: $('#anfme').val(),
+ altme: $('#altme').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
@@ -338,7 +338,7 @@
modiTime: top.strToDate($('#modiTime\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
- // nista: $('#nista').val(),
+ nista: $('#nista').val(),
};
$.ajax({
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index bfc19c8..c4a776a 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -310,15 +310,15 @@
// id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- specs: $('#specs').val(),
- size: $('#size').val(),
- color: $('#color').val(),
- // zmatid: $('#zmatid').val(),
- // werks: $('#werks').val(),
- qty: $('#qty').val(),
- unit: $('#unit').val(),
+ matnr: $('#matnr').val(),
+ lgnum: $('#lgnum').val(),
+ tbnum: $('#tbnum').val(),
+ tbpos: $('#tbpos').val(),
+ zmatid: $('#zmatid').val(),
+ maktx: $('#maktx').val(),
+ werks: $('#werks').val(),
+ anfme: $('#anfme').val(),
+ altme: $('#altme').val(),
zpallet: $('#zpallet').val(),
bname: $('#bname').val(),
memo: $('#memo').val(),
@@ -326,7 +326,8 @@
modiTime: top.strToDate($('#modiTime\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
- // nista: $('#nista').val(),
+ nista: $('#nista').val(),
+
};
$.ajax({
url: baseUrl+"/wrkDetlLog/"+name+"/auth",
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index deae1b9..28dfac5 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -563,15 +563,15 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
- ,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'size', align: 'center',title: '灏哄'}
- ,{field: 'color', align: 'center',title: '棰滆壊'}
- // ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
- // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
+ ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+ ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+ ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
+ ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 1e2bedf..03b6d23 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index cd250d9..e7b17ed 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -38,7 +38,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
+ <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
@@ -68,7 +68,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="maktx" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
@@ -80,7 +80,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="qty" class="layui-input" type="text" lay-verify="number" >
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index e51cd64..7ba5f5f 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -52,12 +52,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="浜у搧鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="浜у搧鎻忚堪" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index e604b4e..fed937d 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,12 +51,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="浜у搧鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="浜у搧鎻忚堪" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery0.html b/src/main/webapp/views/pakStore/locDetlQuery0.html
index 781128a..e18f204 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery0.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery0.html
@@ -51,12 +51,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_name" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 5a516da..40aaa60 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -85,11 +85,11 @@
</div>
<div class="form-item">
<span>浜у搧浠ｅ彿</span>
- <input id="matNo" type="text" disabled="disabled">
+ <input id="matnr" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>浜у搧鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled">
+ <input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -133,8 +133,8 @@
}
parent.updateTableData({
locNo: $('#locNo').val(),
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
count: countDom.val()
})
parent.layer.closeAll();
@@ -143,7 +143,7 @@
function remove() {
parent.removeTableData({
locNo: $('#locNo').val(),
- matNo: $('#matNo').val(),
+ matnr: $('#matnr').val(),
})
parent.layer.closeAll();
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 1e1112f..9df140b 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -130,8 +130,8 @@
cols: [[
{type: 'checkbox', fixed: 'left', width:30},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
- {field: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'},
- {field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'},
+ {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
+ {field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
done: function (res, curr, count) {
@@ -230,7 +230,7 @@
// 淇敼琛ㄦ牸鏁版嵁
function updateTableData(data) {
for (var i=0;i<locDetlData.length;i++) {
- if (data.matNo === locDetlData[i].matNo && data.locNo === locDetlData[i].locNo) {
+ if (data.matnr === locDetlData[i].matnr && data.locNo === locDetlData[i].locNo) {
locDetlData[i].count = data.count;
break
}
@@ -241,7 +241,7 @@
// 鍒犻櫎琛ㄦ牸琛�
function removeTableData(data) {
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
locDetlData.splice(i, 1);
}
}
diff --git a/src/main/webapp/views/pda/stockQuery.html b/src/main/webapp/views/pda/stockQuery.html
index 595f41c..e1dadb2 100644
--- a/src/main/webapp/views/pda/stockQuery.html
+++ b/src/main/webapp/views/pda/stockQuery.html
@@ -108,8 +108,8 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {field: 'matNo', align: 'center', title: '缂栫爜', event: 'detail'},
- {field: 'matName', align: 'center', title: '鍚嶇О', event: 'detail'},
+ {field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
+ {field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'pickNum', align: 'center', title: '鎷ｆ枡', event: 'detail', width:50},
@@ -152,7 +152,7 @@
// 淇敼琛ㄦ牸鏁版嵁
function updateTableData(data) {
for (var i=0;i<locDetlData.length;i++) {
- if (data.matNo === locDetlData[i].matNo && data.locNo === locDetlData[i].locNo) {
+ if (data.matnr === locDetlData[i].matnr && data.locNo === locDetlData[i].locNo) {
locDetlData[i].count = data.count;
break
}
@@ -163,7 +163,7 @@
// 鍒犻櫎琛ㄦ牸琛�
function removeTableData(data) {
for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+ if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
locDetlData.splice(i, 1);
}
}
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index ec37640..1a2d10c 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -26,7 +26,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index f94cf05..6828e88 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -26,7 +26,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 092c137..7d38c6a 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -83,8 +83,8 @@
</form>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="matEditDialog">
- <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
+<script type="text/html" id="eCourseCouEditDialog">
+ <form id="eCourseCouEditForm" lay-filter="eCourseCouEditForm" class="layui-form model-form">
<input name="experimentId" type="hidden"/>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>-->
@@ -101,7 +101,7 @@
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ <button class="layui-btn" lay-filter="eCourseCouEditSubmit" lay-submit>淇濆瓨</button>
</div>
</form>
</script>
@@ -358,84 +358,64 @@
admin.open({
type: 1,
offset: '150px',
- area: '480px',
title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
- content: $('#matEditDialog').html(),
+ content: $('#eCourseCouEditDialog').html(),
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var url = exp ? '../../json/ok.json' : '../../json/ok.json';
// 鍥炴樉鏁版嵁
- form.val('matEditForm', exp);
+ form.val('eCourseCouEditForm', exp);
// 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(matEditSubmit)', function (data) {
- var existMats = [];
- xxDataList.forEach(function(elem) {
- existMats.push(elem.matNo);
- });
- var selectList = matXmSelect.getValue();
- for (var i = 0; i<selectList.length; i++) {
- var item = selectList[i];
- if (existMats.indexOf(item.value) === -1) {
- // 鏌ヨ鐗╂枡璇︽儏
-
-
- xxDataList.push({matNo: item.value});
+ form.on('submit(eCourseCouEditSubmit)', function (data) {
+ if (isExpAdd) { // 鍓嶇澶勭悊娣诲姞銆佷慨鏀�
+ if (exp) { // 鍓嶇淇敼
+ for (var i = 0; i < xxDataList.length; i++) {
+ if (xxDataList[i].experimentName === data.field.experimentName && xxDataList[i].experimentId !== data.field.experimentId) {
+ layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
+ return false;
+ }
+ }
+ layer.close(dIndex);
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].experimentId === data.field.experimentId) {
+ xxDataList[j].experimentName = data.field.experimentName;
+ }
+ }
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ } else { // 鍓嶇娣诲姞
+ for (var i = 0; i < xxDataList.length; i++) {
+ if (xxDataList[i].experimentName === data.field.experimentName) {
+ layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
+ return false;
+ }
+ }
+ layer.close(dIndex);
+ data.field.experimentId = new Date().getTime();
+ xxDataList.push(data.field);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
}
+ } else { // 鍚庣澶勭悊娣诲姞淇敼
+ layer.load(2);
+ if (!exp) {
+ data.field.experimentTypeId = expTpe.experimentTypeId;
+ }
+ $.get(url, {json: JSON.stringify(data.field)}, function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200) {
+ layer.close(dIndex);
+ insTbSSXM.reload({page: {curr: 1}});
+ layer.msg(res.msg, {icon: 1});
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }, 'json');
}
- layer.close(dIndex);
-
- // if (isExpAdd) { // 鍓嶇澶勭悊娣诲姞銆佷慨鏀�
- // if (exp) { // 鍓嶇淇敼
- // for (var i = 0; i < xxDataList.length; i++) {
- // if (xxDataList[i].experimentName === data.field.experimentName && xxDataList[i].experimentId !== data.field.experimentId) {
- // layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
- // return false;
- // }
- // }
- // layer.close(dIndex);
- // for (var j = 0; j < xxDataList.length; j++) {
- // if (xxDataList[j].experimentId === data.field.experimentId) {
- // xxDataList[j].experimentName = data.field.experimentName;
- // }
- // }
- // insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- // } else { // 鍓嶇娣诲姞
- // for (var i = 0; i < xxDataList.length; i++) {
- // if (xxDataList[i].experimentName === data.field.experimentName) {
- // layer.msg('瀹為獙椤圭洰鍚嶇О宸插瓨鍦�', {icon: 2});
- // return false;
- // }
- // }
- // layer.close(dIndex);
- // data.field.experimentId = new Date().getTime();
- // xxDataList.push(data.field);
- // insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- // }
- // } else { // 鍚庣澶勭悊娣诲姞淇敼
- // layer.load(2);
- // if (!exp) {
- // data.field.experimentTypeId = expTpe.experimentTypeId;
- // }
- // $.get(url, {json: JSON.stringify(data.field)}, function (res) {
- // layer.closeAll('loading');
- // if (res.code === 200) {
- // layer.close(dIndex);
- // insTbSSXM.reload({page: {curr: 1}});
- // layer.msg(res.msg, {icon: 1});
- // } else {
- // layer.msg(res.msg, {icon: 2});
- // }
- // }, 'json');
- // }
return false;
});
// 娓叉煋鐗╂枡閫夋嫨
var matXmSelect = xmSelect.render({
el: '#mat',
- style: {
- width: '340px',
- },
+ // radio: true,
autoRow: true,
toolbar: { show: true },
filterable: true,
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index a9d1b88..0211803 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="浜у搧浠ｅ彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="浜у搧浠ｅ彿" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakin/waitPakin_detail.html b/src/main/webapp/views/waitPakin/waitPakin_detail.html
index 920d773..0086f2f 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -38,19 +38,19 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧浠ｅ彿锛�</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text">
+ <input id="matnr" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="maktx" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="qty" class="layui-input" type="text" lay-verify="number" >
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
index 35e33ff..25b198c 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
@@ -44,19 +44,19 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧浠ｅ彿锛�</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text">
+ <input id="matnr" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="maktx" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="qty" class="layui-input" type="text" lay-verify="number" >
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
index ed73a09..8869010 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
@@ -30,7 +30,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text" lay-verify="required" >
+ <input id="matnr" class="layui-input" type="text" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -60,7 +60,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="maktx" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -72,13 +72,13 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="qty" class="layui-input" type="text" lay-verify="number" >
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鍗曘��銆�浣嶏細</label>
<div class="layui-input-inline">
- <input id="unit" class="layui-input" type="text">
+ <input id="altme" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
index 6681140..a614eec 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
@@ -38,7 +38,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栧彿锛�</label>
<div class="layui-input-inline">
- <input id="matNo" class="layui-input" type="text" lay-verify="required" >
+ <input id="matnr" class="layui-input" type="text" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -68,7 +68,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">浜у搧鎻忚堪锛�</label>
<div class="layui-input-inline">
- <input id="matName" class="layui-input" type="text">
+ <input id="maktx" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
@@ -80,7 +80,7 @@
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鏁般��銆�閲忥細</label>
<div class="layui-input-inline">
- <input id="qty" class="layui-input" type="text" lay-verify="number" >
+ <input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
--
Gitblit v1.9.1