Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

liding

2026-06-01 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f

 src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java

@@ -247,6 +247,7 @@
                            setBatchNo(stockInRecord.getBatchNo());
                            setRemark(stockInRecord.getRemark());
                            setWarnNum(stockInRecord.getWarnNum());
                            setWarehouse(stockInRecord.getWarehouse());
                            setVersion(1);
                        }});
                    } else {
@@ -266,6 +267,7 @@
                            setQualitity(stockInRecord.getStockInNum());
                            setBatchNo(stockInRecord.getBatchNo());
                            setRemark(stockInRecord.getRemark());
                            setWarehouse(stockInRecord.getWarehouse());
                            setVersion(1);
                        }});
                    } else {