diff --git a/apps/wpm/migrations/0070_auto_20241112_1447.py b/apps/wpm/migrations/0070_auto_20241112_1447.py
new file mode 100644
index 00000000..70f86c0c
--- /dev/null
+++ b/apps/wpm/migrations/0070_auto_20241112_1447.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.2.12 on 2024-11-12 06:47
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0042_auto_20241010_1140'),
+        ('wpm', '0069_auto_20240905_1057'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='wmaterial',
+            name='batch_ofrom',
+            field=models.TextField(blank=True, null=True, verbose_name='原料批次号'),
+        ),
+        migrations.AddField(
+            model_name='wmaterial',
+            name='material_ofrom',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wm_mofrom', to='mtm.material', verbose_name='原料物料'),
+        ),
+        migrations.AlterField(
+            model_name='handover',
+            name='batch',
+            field=models.TextField(blank=True, null=True, verbose_name='批次号'),
+        ),
+        migrations.AlterField(
+            model_name='mlog',
+            name='batch',
+            field=models.TextField(blank=True, null=True, verbose_name='批次号'),
+        ),
+        migrations.AlterField(
+            model_name='mlogb',
+            name='batch',
+            field=models.TextField(blank=True, null=True, verbose_name='批次号'),
+        ),
+        migrations.AlterField(
+            model_name='wmaterial',
+            name='batch',
+            field=models.TextField(verbose_name='批次号'),
+        ),
+    ]
diff --git a/apps/wpm/models.py b/apps/wpm/models.py
index 3fab7403..af04f110 100644
--- a/apps/wpm/models.py
+++ b/apps/wpm/models.py
@@ -106,13 +106,16 @@ class WMaterial(CommonBDModel):
         Material, verbose_name='物料', on_delete=models.CASCADE, related_name='wm_m')
     supplier = models.ForeignKey(Supplier, verbose_name='外协供应商', on_delete=models.SET_NULL, null=True, blank=True)
     mgroup = models.ForeignKey(Mgroup, verbose_name='所在工段', on_delete=models.CASCADE, null=True, blank=True)
-    batch = models.CharField('批次号', max_length=50)
+    batch = models.TextField('批次号')
     count = models.PositiveIntegerField('当前数量', default=0)
     count_eweight = models.FloatField('单数重量', default=0)
     notok_sign = models.CharField('不合格标记', max_length=10, null=True, blank=True)
     material_origin = models.ForeignKey(Material, verbose_name='原始物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='wm_mo')
     count_xtest = models.PositiveIntegerField('已检数量', null=True, blank=True)
 
+    batch_ofrom = models.TextField('原料批次号', null=True, blank=True)
+    material_ofrom = models.ForeignKey(Material, verbose_name='原料物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='wm_mofrom')
+
     @property
     def count_working(self):
         return Mlogb.objects.filter(wm_in=self, mlog__work_end_time__isnull=True).aggregate(count=Sum('count_use'))['count'] or 0
@@ -184,7 +187,7 @@ class Mlog(CommonADModel):
 
     shift = models.ForeignKey(
         Shift, verbose_name='关联班次', on_delete=models.SET_NULL, null=True, blank=True)
-    batch = models.CharField('批次号', max_length=50, null=True, blank=True)
+    batch = models.TextField('批次号', null=True, blank=True)
     count_use = models.PositiveIntegerField('领用数', default=0)
     count_real = models.PositiveIntegerField('实际生产数', default=0)
     count_real_eweight = models.FloatField('单数重量', default=0)
@@ -277,7 +280,7 @@ class Mlogb(BaseModel):
     mlog = models.ForeignKey(Mlog, verbose_name='关联日志',
                              on_delete=models.CASCADE, related_name='b_mlog')
     note = models.TextField('备注', default='', blank=True)
-    batch = models.CharField('批次号', max_length=50, null=True, blank=True)
+    batch = models.TextField('批次号', null=True, blank=True)
     mtask = models.ForeignKey(Mtask, verbose_name='关联任务',
                               on_delete=models.CASCADE, related_name='mlogb_mtask', null=True, blank=True)
     wm_in = models.ForeignKey(WMaterial, verbose_name='投入物料所在库存', on_delete=models.SET_NULL, null=True, blank=True)
@@ -327,7 +330,7 @@ class Handover(CommonADModel):
         Mgroup, verbose_name='送料工段', on_delete=models.CASCADE, null=True, blank=True)
     send_dept = models.ForeignKey(
         Dept, verbose_name='送料部门', on_delete=models.CASCADE, related_name='handover_send_dept')
-    batch = models.CharField('批次号', max_length=50, null=True, blank=True)
+    batch = models.TextField('批次号', null=True, blank=True)
     material = models.ForeignKey(
         Material, verbose_name='物料', on_delete=models.CASCADE, related_name='h_ma')
     material_changed = models.ForeignKey(Material, verbose_name='变更后物料', on_delete=models.CASCADE, null=True, blank=True, related_name='h_ma_c')