Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/ikanalyzer/IKSegmenter.java

@@ -49,7 +49,7 @@ public class IKSegmenter {
             e.printStackTrace();
         }
         List<String> list = new ArrayList<>();
-        String [] strArr = strs.split("|");
+        String [] strArr = strs.split("[|]");
         for (String str : strArr) {
             list.add(str);
         }

src/main/java/com/jeeplus/modules/warehouse/ledger/service/LedgerService.java

@@ -148,6 +148,14 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
 			oldLeger.setShelvesIds(newSIds);
 			oldLeger.setNum(oldLeger.getNum() + num);
 			oldLeger.setSum(oldLeger.getSum().add(sum));
+			List<LedgerInfo> oldLedgerInfos = oldLeger.getLedgerInfoList();
+			if (null != oldLedgerInfos) {
+				List<LedgerInfo> newLedgerInfos = new ArrayList<>();
+				newLedgerInfos.addAll(oldLedgerInfos);
+				newLedgerInfos.addAll(ledger.getLedgerInfoList());
+				oldLeger.setLedgerInfoList(newLedgerInfos);
+			}
+
 			oldLeger.preUpdate();
 			mapper.update(oldLeger);
 			ledger = oldLeger;

src/main/java/com/jeeplus/modules/warehouse/qrcode/mapper/xml/QrCodeMapper.xml

@@ -220,7 +220,6 @@
 		type.code AS "goodsInfo.type.code",
 		type.name AS "goodsInfo.type.name",
 
-		gi.id AS "goodsInfo.id",
 		gi.NAME AS "goodsInfo.name",
 		gi.model AS "goodsInfo.model",
 		gi.amount AS "goodsInfo.amount",

src/main/java/com/jeeplus/modules/warehouse/storage/service/StorageService.java

@@ -222,7 +222,9 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 	 * @return
 	 */
 	@Transactional(readOnly = false)
-	public Page<StorageInfo> findByPcTypeModel(Page<StorageInfo> page, StorageInfo si) {
+	public Page<StorageInfo> findByPcTypeModel(Page<QrCode> page, StorageInfo si) {
+
+
 		GoodsInfo goodsInfo = si.getGoodsInfo();
 		QrCode temQr = new QrCode();
 		String model = goodsInfo.getModel();
@@ -235,6 +237,8 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 		if (null != qr && StringUtils.isNotBlank(qr.getState())) {
 			temQr.setState(qr.getState());
 		}
+		dataRuleFilter(temQr);
+		temQr.setPage(page);
 		List<QrCode> qrCodeList = qrCodeMapper.findByPcTypeModel(temQr);
 
 		List<StorageInfo> storageInfoList = new ArrayList<>();
@@ -249,7 +253,14 @@ public class StorageService extends CrudService<StorageMapper, Storage> {
 			storageInfo.setQrCode(qrCode);
 			storageInfoList.add(storageInfo);
 		}
-		page.setList(storageInfoList);
-		return page;
+		Page<StorageInfo> storageInfoPage = new Page<>();
+		storageInfoPage.setList(storageInfoList);
+		storageInfoPage.setCount(page.getCount());
+		storageInfoPage.setPageNo(page.getPageNo());
+		storageInfoPage.setPageSize(page.getPageSize());
+		storageInfoPage.setOrderBy(page.getOrderBy());
+		storageInfoPage.setFuncName(page.getFuncName());
+		storageInfoPage.setFuncParam(page.getFuncParam());
+		return storageInfoPage;
 	}
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java

@@ -273,7 +273,7 @@ public class StorageController extends BaseController {
 	public Map<String, Object> findByPcTypeModel(HttpServletRequest request, HttpServletResponse response, StorageInfo storageInfo) {
 		GoodsInfo goodsInfo = storageInfo.getGoodsInfo();
 		if (null != goodsInfo && null != goodsInfo.getGoods() && null != goodsInfo.getType() && StringUtils.isNotBlank(goodsInfo.getGoods().getBatchNum()) && StringUtils.isNotBlank(goodsInfo.getType().getId())) {
-			Page<StorageInfo> page = storageService.findByPcTypeModel(new Page<StorageInfo>(request, response), storageInfo);
+			Page<StorageInfo> page = storageService.findByPcTypeModel(new Page<QrCode>(request, response), storageInfo);
 			return getBootstrapData(page);
 		} else {
 			return null;