github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-05 04:03:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sungsu
2024-01-22 18:11:11 +09:00
parent 70a5906299 ccd2c001b4
commit 3329c00019
5 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/no1/wms/in/InController.java
View File

@@ -79,10 +79,8 @@ public class InController {
@PostMapping("/create_process") @PostMapping("/create_process")
@ResponseBody @ResponseBody
public int createProcess(InDto dto) { public boolean createProcess(InDto dto) {
boolean create = inService.chechAndUpdateOrCreateProcessForCreate(dto); return inService.chechAndUpdateOrCreateProcessForCreate(dto);
return 0;
} }
@PostMapping("/read") @PostMapping("/read")

12
src/main/webapp/WEB-INF/views/category/list.jsp
View File

@@ -52,12 +52,12 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${list }" var="dto"> <c:forEach items="${list }" var="dto">
<tr class="detailTr" data-kan_code="${dto.kan_code}" > <tr class="detailTr col-5" data-kan_code="${dto.kan_code}" >
<td>${dto.cls_nm_1 }</td> <td class="col-1">${dto.cls_nm_1 }</td>
<td>${dto.cls_nm_2 }</td> <td class="col-1">${dto.cls_nm_2 }</td>
<td>${dto.cls_nm_3 }</td> <td class="col-1">${dto.cls_nm_3 }</td>
<td>${dto.cls_nm_4 }</td> <td class="col-1">${dto.cls_nm_4 }</td>
<td>${dto.kan_code }</td> <td class="col-1">${dto.kan_code }</td>
</tr> </tr>
</c:forEach> </c:forEach>
</tbody> </tbody>

8
src/main/webapp/WEB-INF/views/in/create.jsp
View File

@@ -25,7 +25,7 @@
<div class="col-12" style="text-align: center;"> <div class="col-12" style="text-align: center;">
<!-- 제품명 --> <!-- 제품명 -->
<div class="input-group mb-3 w-40 col-centered"> <div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon1">제품명</span> <span class="input-group-text" id="product_name_span">제품명</span>
<input type="text" name="productName" id="productName" class="form-control" <input type="text" name="productName" id="productName" class="form-control"
placeholder="제품명을 검색하세요" aria-label="제품명" value="${dto.productDto.name }" placeholder="제품명을 검색하세요" aria-label="제품명" value="${dto.productDto.name }"
aria-describedby="basic-addon1" readonly> aria-describedby="basic-addon1" readonly>
@@ -63,7 +63,7 @@
</div> </div>
<!-- 창고명 --> <!-- 창고명 -->
<div class="input-group mb-3 w-40 col-centered"> <div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon1">창고명</span> <span class="input-group-text" id="warehouse_name_span">창고명</span>
<input type="text" name="warehouse_name" id="warehouse_name" class="form-control" <input type="text" name="warehouse_name" id="warehouse_name" class="form-control"
placeholder="창고를 검색하세요" aria-label="창고명" value="${dto.warehouseDto.name }" placeholder="창고를 검색하세요" aria-label="창고명" value="${dto.warehouseDto.name }"
aria-describedby="basic-addon1" readonly> aria-describedby="basic-addon1" readonly>
@@ -94,7 +94,7 @@
<div class="input-group mb-3 w-40 col-centered"> <div class="input-group mb-3 w-40 col-centered">
<span class="input-group-text" id="basic-addon3">입고날짜</span> <span class="input-group-text" id="basic-addon3">입고날짜</span>
<fmt:formatDate value="${dto.in_date}" pattern="yyyy-MM-dd HH:mm:ss" type="date" var="formattedDate" /> <fmt:formatDate value="${dto.in_date}" pattern="yyyy-MM-dd'T'HH:mm" type="date" var="formattedDate" />
<input type="datetime-local" id="in_date" name="in_date" class="form-control" <input type="datetime-local" id="in_date" name="in_date" class="form-control"
placeholder="날짜을 입력하세요" aria-label="입고날짜" value="${formattedDate}" placeholder="날짜을 입력하세요" aria-label="입고날짜" value="${formattedDate}"
aria-describedby="basic-addon1"> aria-describedby="basic-addon1">
@@ -180,7 +180,7 @@
warehouse_id : warehouse_id, warehouse_id : warehouse_id,
note : note note : note
} }
console.log(data);
$.ajax({ $.ajax({
url: "/in/create_process", url: "/in/create_process",

14
src/main/webapp/WEB-INF/views/modal/category.jsp
View File

@@ -113,13 +113,13 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${list }" var="dto"> <c:forEach items="${list }" var="dto">
<tr class="detailTr" data-kan_code="${dto.kan_code}" > <tr class="detailTr col-6" data-kan_code="${dto.kan_code}" >
<td>${dto.cls_nm_1 }</td> <td class="col-1">${dto.cls_nm_1 }</td>
<td>${dto.cls_nm_2 }</td> <td class="col-1">${dto.cls_nm_2 }</td>
<td>${dto.cls_nm_3 }</td> <td class="col-1">${dto.cls_nm_3 }</td>
<td>${dto.cls_nm_4 }</td> <td class="col-1">${dto.cls_nm_4 }</td>
<td>${dto.kan_code }</td> <td class="col-1">${dto.kan_code }</td>
<td><button data-tid="${dto.kan_code}" data-tname="${dto.cls_nm_4}" class="btn btn-primary" onclick="onSelect(this)">선택</button></td> <td class="col-1"><button data-tid="${dto.kan_code}" data-tname="${dto.cls_nm_4}" class="btn btn-primary" onclick="onSelect(this)">선택</button></td>
</tr> </tr>
</c:forEach> </c:forEach>
</tbody> </tbody>

2
src/main/webapp/WEB-INF/views/mypage/mypage.jsp
View File

@@ -194,7 +194,7 @@
});//submitBtn });//submitBtn
});//ready });//ready
function _onSubmit(){ function _onSubmit(){
if($("#file").val() == ""){ if($("#file").val()){
alert("이미지 파일을 업로드해주세요."); alert("이미지 파일을 업로드해주세요.");
$("#file").focus(); $("#file").focus();
return false; return false;