Commit 10aec369 zshaohui

入库bug修复

1 个父辈 be83b513
......@@ -99,6 +99,7 @@ public class LineController {
//1.解析条码
Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
if (barcode == null) {
log.info(barcode.getBarcode()+"绑定人工作业或者砍单回库作业,不进行校验");
return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
}
......
......@@ -12,6 +12,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.bean.ManualPutIn;
import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -21,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@Api(tags = "人工作业")
@RequestMapping("/manualWork")
@RestController
......@@ -64,6 +65,7 @@ public class ManualWorkController {
}
}
log.info("人工作业面绑定信息:"+boxBarcode.getBarcode());
cacheList.add(boxBarcode.getBarcode());
dataCache.updateCache(CacheNameUtil.CHCHE_MANUALWORK_PUTIN, cacheList);
......
......@@ -47,7 +47,7 @@ public class CacheUtil {
cancelCacheMap = new HashMap<>();
}
cancelCacheMap.remove(boxStr);
dataCache.updateCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF,cacheMap);
dataCache.updateCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF,cancelCacheMap);
}
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!