-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #152 from in27sung/develop2
Develop2
- Loading branch information
Showing
10 changed files
with
1,528 additions
and
1,041 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -300,4 +300,4 @@ | |
</plugin> | ||
</plugins> | ||
</build> | ||
</project> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
stockMate/src/main/java/com/stockm8/domain/dto/ScanProductDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.stockm8.domain.dto; | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
||
import lombok.Data; | ||
|
||
@Data | ||
public class ScanProductDTO { | ||
@JsonProperty("productId") | ||
private int productId; | ||
|
||
@JsonProperty("barcode") | ||
private String barcode; | ||
|
||
@JsonProperty("businessId") | ||
private int businessId; | ||
|
||
@JsonProperty("baseUnit") | ||
private String baseUnit; | ||
|
||
@JsonProperty("setSize") | ||
private int setSize; | ||
} |
734 changes: 367 additions & 367 deletions
734
stockMate/src/main/webapp/WEB-INF/views/order/register2.jsp
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.