1.元器件信息,上传时增加尺寸确认字段

2.去掉:出库时,mes传过来根据不同颜色亮灯

myproject/src/main/java/com/myproject/webapp/controller/FileUploadController.java

@@ -220,6 +220,13 @@ public class FileUploadController extends BaseFormController {
         }
         }
 
 
         int supplierIndex = csvRead.getIndex("供应商","supplier","SP");
         int supplierIndex = csvRead.getIndex("供应商","supplier","SP");
+
+        int sizeConfirmedIndex = csvRead.getIndex("是否确认尺寸", "sizeConfirm(y/n)");
+        if (sizeConfirmedIndex == -1) {
+            String errorMsg = getText("error.file.culumn.required", new String[]{"sizeConfirm(y/n)"}, request.getLocale(), "必须包含【是否确认尺寸】或[sizeConfirm]列");
+            throw new ValidateException(errorMsg);
+        }
+
 //        if (supplierIndex == -1){
 //        if (supplierIndex == -1){
 //            log.info("未包含【供应商】或【supplier】列");
 //            log.info("未包含【供应商】或【supplier】列");
 //            throw new ValidateException("必须包含【供应商】或【supplier】列");
 //            throw new ValidateException("必须包含【供应商】或【supplier】列");
@@ -269,6 +276,8 @@ public class FileUploadController extends BaseFormController {
 
 
                 component.setProvider(supplier);
                 component.setProvider(supplier);
 
 
+                component.setSizeConfirmed("y".equals(lineValues[sizeConfirmedIndex]));
+
 //                component.setSupplierPn(spn);
 //                component.setSupplierPn(spn);
 
 
                 //component.setType(Integer.valueOf(typeStr));
                 //component.setType(Integer.valueOf(typeStr));
@@ -292,6 +301,7 @@ public class FileUploadController extends BaseFormController {
                     component.setHeight(c.getHeight());
                     component.setHeight(c.getHeight());
                     component.setProvider(c.getProvider());
                     component.setProvider(c.getProvider());
                     component.setType(c.getType());
                     component.setType(c.getType());
+                    component.setSizeConfirmed(c.isSizeConfirmed());
                     updateRowCount ++;
                     updateRowCount ++;
                 }
                 }
 
 

myproject/src/main/java/com/myproject/webapp/controller/webService/MesApiController.java

@@ -185,7 +185,7 @@ public class MesApiController extends BaseController {
 
 
         try {
         try {
             String[] REEL_IDS = request.getParameterValues("RIS");
             String[] REEL_IDS = request.getParameterValues("RIS");
-            String rgbCode = request.getParameter("rgbCode"); //亮灯颜色
+            //String rgbCode = request.getParameter("rgbCode"); //亮灯颜色
 
 
             if(REEL_IDS == null || REEL_IDS.length == 0){
             if(REEL_IDS == null || REEL_IDS.length == 0){
                 return "Error"+getText("smfcore.mesApi.codeResolveUrl.paramNull",new String[]{"RIS"},request.getLocale());
                 return "Error"+getText("smfcore.mesApi.codeResolveUrl.paramNull",new String[]{"RIS"},request.getLocale());
@@ -193,10 +193,10 @@ public class MesApiController extends BaseController {
             }
             }
 
 
             //判断亮灯颜色是否在这20种内
             //判断亮灯颜色是否在这20种内
-            if (StringUtils.isBlank(colorMap.get(rgbCode))){
+            /*if (StringUtils.isBlank(colorMap.get(rgbCode))){
                 return "Error"+getText("color.error.notExist",new String[]{"rgbCode"},request.getLocale());
                 return "Error"+getText("color.error.notExist",new String[]{"rgbCode"},request.getLocale());
                 //return "Error: rgbCode 不在颜色范围内";
                 //return "Error: rgbCode 不在颜色范围内";
-            }
+            }*/
 
 
             ArrayList<StoragePos> poses = Lists.newArrayList();
             ArrayList<StoragePos> poses = Lists.newArrayList();
             for (String REEL_ID : REEL_IDS) {
             for (String REEL_ID : REEL_IDS) {
@@ -209,7 +209,7 @@ public class MesApiController extends BaseController {
             }
             }
             for (StoragePos pos : poses) {
             for (StoragePos pos : poses) {
                 log.info("出库位置仓位【"+pos.getPosName()+"】");
                 log.info("出库位置仓位【"+pos.getPosName()+"】");
-                taskService.checkout(pos,false,null,false,rgbCode);
+                taskService.checkout(pos,false,null,false,"");
             }
             }
 
 
         }catch (Exception e){
         }catch (Exception e){

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -1705,9 +1705,9 @@ public class TaskService implements ITaskService {
         task.setStatus(StorageConstants.OP_STATUS.WAIT.name());
         task.setStatus(StorageConstants.OP_STATUS.WAIT.name());
         task.setSingleOut(isSingleOut);
         task.setSingleOut(isSingleOut);
         //判断颜色是否为空
         //判断颜色是否为空
-        if (StringUtils.isNotBlank(rgbCode)){
+        /*if (StringUtils.isNotBlank(rgbCode)){
             task.setLightColor(rgbCode);
             task.setLightColor(rgbCode);
-        }
+        }*/
         //工单出库任务
         //工单出库任务
         if (!Strings.isNullOrEmpty(subSourceId)) {
         if (!Strings.isNullOrEmpty(subSourceId)) {
             LiteOrderItem liteOrderItem = liteOrderItemDao.findOneById(subSourceId);
             LiteOrderItem liteOrderItem = liteOrderItemDao.findOneById(subSourceId);

myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp

@@ -56,9 +56,9 @@
                     <div class="actions">
                     <div class="actions">
                         <a href="componentUpdate.html?type=${type}" class="btn btn-default btn-sm">
                         <a href="componentUpdate.html?type=${type}" class="btn btn-default btn-sm">
                             <i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a>
                             <i class="fa fa-plus"></i> <fmt:message key="button.add"/> </a>
-<%--                        <a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i--%>
-<%--                                class="fa fa-upload"></i><fmt:message--%>
-<%--                                key="button.uploadFile"/></a>--%>
+                        <a class="btn btn-default btn-sm" data-toggle="modal" href="#basic"><i
+                                class="fa fa-upload"></i><fmt:message
+                                key="button.uploadFile"/></a>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div class="portlet-body">
                 <div class="portlet-body">