1.uid出库导出,增加状态

2.条码解析 转成大写

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -11,6 +11,7 @@ import org.apache.logging.log4j.Logger;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  *
@@ -465,7 +466,7 @@ public class BarcodeRule {
     }
 
     public CodeBean toCodeBean(String codeStr){
-        log.debug("开始解析条码["+codeStr+"]");
+        log.info("开始解析条码["+codeStr+"]");
         CodeBean codeBean = new CodeBean();
         codeBean.setCodeStr(codeStr);
         //是否带有位置信息
@@ -511,8 +512,10 @@ public class BarcodeRule {
             codeBean.setReelWidth(reelWidth);
             codeBean.setReelHeight(reelHeight);
             codeStr = arr[1];
-
         }
+
+        codeStr = codeStr.toUpperCase(Locale.ROOT);
+
         codeBean.setCodeStr(codeStr);
         if(!isValidRule()){
             codeBean.setError("smfcore.error.barcode.noRule","解析规则未定义");

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -9,6 +9,7 @@ import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.barcode.bean.CodeBean;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.BarcodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.dto.CodeDto;
 import com.neotel.smfcore.core.barcode.rest.bean.mapstruct.CodeMapper;
@@ -450,7 +451,7 @@ public class StoragePosController {
         }
 
         Query query = QueryHelp.getQuery(criteria);
-        Criteria baseCriteria = Criteria.where("used").is(true);
+        Criteria baseCriteria = Criteria.where("used").is(true).and("barcode").exists(true);
 
         int componentType = criteria.getComponentType();
         if (componentType != -1) {
@@ -665,6 +666,7 @@ public class StoragePosController {
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.barcode",locale,"条码编号")));
                 header.add(Lists.newArrayList(MessageUtils.getText("",locale,"栈板id")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.partNumber",locale,"物料编号")));
+                header.add(Arrays.asList("状态"));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.proDate",locale,"生产日期")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"过期时间")));
                 header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号")));
@@ -696,13 +698,20 @@ public class StoragePosController {
                     data.add(pos.getBarcode().getBarcode());
                     data.add(pos.getBarcode().getPalletId());
                     data.add(pos.getBarcode().getPartNumber());
+
+                    String statusStr = "";
+                    if (pos.getBarcode().getStatus() == BARCODE_STATUS.IN_STORE){
+                        statusStr = "在库";
+                    }
+
+                    data.add(statusStr);
                     data.add(proDate);
                     data.add(expireDate);
                     data.add(pos.getPosName());
                     data.add(pos.getBarcode().getLockName());
                     data.add(pos.getBarcode().getAmount());
                     data.add(putInTime);
-                    data.add(dateFormat.format(pos.getBarcode().getPutInDate()));
+                    data.add("");
                     dataList.add(data);
                 }
                 return dataList;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -182,7 +182,7 @@ public class CDeviceController {
         }
 
         //调用禁用料信息
-        barcode = smfApi.canPutInAfterResolve(barcode);
+        //barcode = smfApi.canPutInAfterResolve(barcode);
 
         //获取库别
         String warhouseCode = MaterialUtil.getWarhouseCode(materialStr);
@@ -798,9 +798,9 @@ public class CDeviceController {
                 }
             }
         }
-        if (count < 2) {
+        if (count < 4) {
             try {
-                log.info("AGV上的料箱数量小于2,呼叫一个空料箱出来");
+                log.info("AGV上的料箱数量小于4,呼叫一个空料箱出来");
                 String materialSize = MaterialUtil.getMaterialSize(stackerId);
                 BoxHandleUtil.callEmptyBox(materialSize, TaskCurrentLoc.In_FeedingInlet, stackerBarcode.getWarehouseCode(), new ArrayList<>());
             } catch (Exception e) {
@@ -843,7 +843,7 @@ public class CDeviceController {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"物料信息"});
         }
 
-        codeStr = codeStr.toUpperCase(Locale.ROOT);
+        //codeStr = codeStr.toUpperCase(Locale.ROOT);
 
         if (StringUtils.isEmpty(materialStr)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"});

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualTicketTransferController.java

@@ -206,7 +206,7 @@ public class ManualTicketTransferController {
                 barcode = barcodeManager.save(barcode);
 
 
-                generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name());
+                generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name(),ticketCode);
 
 
 
@@ -229,7 +229,7 @@ public class ManualTicketTransferController {
 
 
 
-    private void generatePutInTask(Barcode barcode, Barcode boxBarcode,String status) {
+    private void generatePutInTask(Barcode barcode, Barcode boxBarcode,String status,String sourceName) {
         DataLog dataLog = new DataLog();
         dataLog.setPosId(boxBarcode.getId());
         dataLog.setPosName(barcode.getPosName());
@@ -241,7 +241,7 @@ public class ManualTicketTransferController {
         dataLog.setType(OP.PUT_IN);
         dataLog.setStatus(status);
         dataLog.setBatchInfo(barcode.getBatch());
-        dataLog.setSourceName(barcode.getBarSource());
+        dataLog.setSourceName(sourceName);
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
         taskService.updateFinishedTask(dataLog);
     }