Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 788296b6 由 sunke
选项

扫码料架 

日历框中文乱码问题
1 个父辈 d5453cda
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 44 行增加 和 23 行删除
myproject/src/main/java/com/myproject/bean/update/Storage.java
...@@ -179,6 +179,13 @@ public class Storage extends BaseMongoBean { ...@@ -179,6 +179,13 @@ public class Storage extends BaseMongoBean {
return StorageConstants.TYPE.ACCSHELF.name().equals(type); return StorageConstants.TYPE.ACCSHELF.name().equals(type);
} }
/**
* 是否是扫码料架
*/
public boolean isCodeShelf() {
return StorageConstants.TYPE.CODESHELF.name().equals(type);
}
/** /**
* 是否是料柜 * 是否是料柜
......
myproject/src/main/java/com/myproject/util/StorageConstants.java
...@@ -218,6 +218,11 @@ public class StorageConstants { ...@@ -218,6 +218,11 @@ public class StorageConstants {
*/ */
NEWSHELF("storage.type.newShelf"), NEWSHELF("storage.type.newShelf"),
/**
* 9 扫码料架
*/
CODESHELF("storage.type.codeShelf"),
; ;
private String key; private String key;
......
myproject/src/main/java/com/myproject/webapp/controller/webService/DataCache.java
...@@ -557,9 +557,10 @@ public class DataCache{ ...@@ -557,9 +557,10 @@ public class DataCache{
return null; return null;
} }
public Storage reloadStorage(Storage storage){ public Storage reloadStorage(Storage storage) throws ValidateException {
List<PlateSizeBean> plateSizeBeanList = storagePosManager.getStoragePosUsage(storage.getId()); List<PlateSizeBean> plateSizeBeanList = storagePosManager.getStoragePosUsage(storage.getId());
storage.initUsage(plateSizeBeanList); storage.initUsage(plateSizeBeanList);
storage = storageManager.save(storage);
allStorage.put(storage.getCid(), storage); allStorage.put(storage.getCid(), storage);
return storage; return storage;
} }
...@@ -601,14 +602,20 @@ public class DataCache{ ...@@ -601,14 +602,20 @@ public class DataCache{
* 获取库存信息,key 为 PN * 获取库存信息,key 为 PN
*/ */
public Map<String,InventoryItem> getAllInventory(){ public Map<String,InventoryItem> getAllInventory(){
Map<String,InventoryItem> allInventory = Maps.newHashMap();
Map<String, Storage> allStorages = getAllStorage(); Map<String, Storage> allStorages = getAllStorage();
for (String cid : allStorages.keySet()) { return getInventory(allStorages.values());
Map<String, InventoryItem> storageInventory = getStorageInventory(cid); }
/**
* 获取某些料仓的库存信息
*/
public Map<String,InventoryItem> getInventory(Collection<Storage> storageList){
Map<String,InventoryItem> resultMap = Maps.newHashMap();
for (Storage storage : storageList) {
Map<String, InventoryItem> storageInventory = getStorageInventory(storage.getCid());
for(InventoryItem storageInventoryItem : storageInventory.values()){ for(InventoryItem storageInventoryItem : storageInventory.values()){
String partNumber = storageInventoryItem.getPartNumber(); String partNumber = storageInventoryItem.getPartNumber();
InventoryItem pnInventoryItem = allInventory.get(storageInventoryItem.getPartNumber()); InventoryItem pnInventoryItem = resultMap.get(storageInventoryItem.getPartNumber());
if(pnInventoryItem == null){ if(pnInventoryItem == null){
pnInventoryItem = new InventoryItem(); pnInventoryItem = new InventoryItem();
} }
...@@ -617,12 +624,15 @@ public class DataCache{ ...@@ -617,12 +624,15 @@ public class DataCache{
pnInventoryItem.setLockCount(pnInventoryItem.getLockCount() + storageInventoryItem.getLockCount()); pnInventoryItem.setLockCount(pnInventoryItem.getLockCount() + storageInventoryItem.getLockCount());
pnInventoryItem.setStockReel(pnInventoryItem.getStockReel() + storageInventoryItem.getStockReel()); pnInventoryItem.setStockReel(pnInventoryItem.getStockReel() + storageInventoryItem.getStockReel());
pnInventoryItem.setLockReel(pnInventoryItem.getLockReel() + storageInventoryItem.getLockReel()); pnInventoryItem.setLockReel(pnInventoryItem.getLockReel() + storageInventoryItem.getLockReel());
allInventory.put(partNumber,pnInventoryItem); resultMap.put(partNumber,pnInventoryItem);
} }
} }
return allInventory; return resultMap;
} }
/**
* 获取料仓的库存信息
*/
public Map<String, InventoryItem> getStorageInventory(String cid){ public Map<String, InventoryItem> getStorageInventory(String cid){
Map<String, InventoryItem> storageInventory = inventoryMap.get(cid); Map<String, InventoryItem> storageInventory = inventoryMap.get(cid);
if(storageInventory == null){ if(storageInventory == null){
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
...@@ -349,13 +349,6 @@ ...@@ -349,13 +349,6 @@
<c:set var="scripts" scope="request"> <c:set var="scripts" scope="request">
<script> <script>
$('.date-picker').datepicker({
rtl: Metronic.isRTL(),
orientation: "left",
autoclose: true,
language:'${locale}'
});
var limitCodes = "${limitCodes}".split(","); var limitCodes = "${limitCodes}".split(",");
for (i=0;i<limitCodes.length ;i++ ) { for (i=0;i<limitCodes.length ;i++ ) {
var limitClass = ".limit"+limitCodes[i]; var limitClass = ".limit"+limitCodes[i];
......
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
...@@ -174,12 +174,16 @@ ...@@ -174,12 +174,16 @@
<c:set var="detailUrl" value="${ctx}/storage/accShelf/${storage.cid}"/> <c:set var="detailUrl" value="${ctx}/storage/accShelf/${storage.cid}"/>
</c:if> </c:if>
<c:if test="${storage.codeShelf}">
<c:set var="detailUrl" value="${ctx}/storage/codeShelf"/>
</c:if>
<c:if test="${storage.virtual}"> <c:if test="${storage.virtual}">
<c:set var="detailUrl" value="${ctx}/storage/virtual/${storage.cid}"/> <c:set var="detailUrl" value="${ctx}/storage/virtual/${storage.cid}"/>
</c:if> </c:if>
<div class="portlet box green-haze tasks-widget"> <div class="portlet box green-haze tasks-widget">
<c:choose> <c:choose>
<c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual}"> <c:when test="${storage.shelf || storage.cabinet || storage.accShelf || storage.virtual || storage.codeShelf}">
<%--智能料架--%> <%--智能料架--%>
<div class="portlet-title"> <div class="portlet-title">
<div style="text-align:center;font-size: 28px;"><a style="color:#FFFFFF;" href="${detailUrl}">${storage.name}</a></div> <div style="text-align:center;font-size: 28px;"><a style="color:#FFFFFF;" href="${detailUrl}">${storage.name}</a></div>
...@@ -805,12 +809,14 @@ ...@@ -805,12 +809,14 @@
var allContent = $(".task-content"); var allContent = $(".task-content");
allContent.each(function(index){ allContent.each(function(index){
var itemCount = $(this).children(".itembox").size();
$(this).attr("style","height:"+itemCount*34+"px;");
if(index % 2 == 1){ if(index % 2 == 1){
var height = $(this).attr("style"); var height = $(this).attr("style");
if(height){ if(height){
return; return;
} }
var itemCount = $(this).children(".itembox").size();
var lastContent = allContent.eq(index -1); var lastContent = allContent.eq(index -1);
var lastItemCount = lastContent.children(".itembox").size(); var lastItemCount = lastContent.children(".itembox").size();
if(itemCount < lastItemCount){ if(itemCount < lastItemCount){
......
myproject/src/main/webapp/assets/global/plugins/bootstrap-datepicker/js/locales/bootstrap-datepicker.zh-CN.js
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
*/ */
;(function($){ ;(function($){
$.fn.datepicker.dates['zh-CN'] = { $.fn.datepicker.dates['zh-CN'] = {
days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"], days: ["\u661F\u671F\u65E5", "\u661F\u671F\u4E00", "\u661F\u671F\u4E8C", "\u661F\u671F\u4E09", "\u661F\u671F\u56DB", "\u661F\u671F\u4E94", "\u661F\u671F\u516D", "\u661F\u671F\u65E5"],
daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"], daysShort: ["\u5468\u65E5", "\u5468\u4E00", "\u5468\u4E8C", "\u5468\u4E09", "\u5468\u56DB", "\u5468\u4E94", "\u5468\u516D", "\u5468\u65E5"],
daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"], daysMin: ["\u65E5", "\u4E00", "\u4E8C", "\u4E09", "\u56DB", "\u4E94", "\u516D", "\u65E5"],
months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], months: ["\u4E00\u6708", "\u4E8C\u6708", "\u4E09\u6708", "\u56DB\u6708", "\u4E94\u6708", "\u516D\u6708", "\u4E03\u6708", "\u516B\u6708", "\u4E5D\u6708", "\u5341\u6708", "\u5341\u4E00\u6708", "\u5341\u4E8C\u6708"],
monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], monthsShort: ["\u4E00\u6708", "\u4E8C\u6708", "\u4E09\u6708", "\u56DB\u6708", "\u4E94\u6708", "\u516D\u6708", "\u4E03\u6708", "\u516B\u6708", "\u4E5D\u6708", "\u5341\u6708", "\u5341\u4E00\u6708", "\u5341\u4E8C\u6708"],
today: "今日", today: "\u4ECA\u65E5",
weekStart: 1 weekStart: 1
}; };
$.fn.datepicker.dates['en'] = { $.fn.datepicker.dates['en'] = {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!