diff --git a/manifest.json b/manifest.json
index 9a7589a..c0a83ad 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name" : "华东医药",
     "appid" : "__UNI__F094DF8",
-    "description" : "华东医药WMS手持系统",
+    "description" : "华东医药LMS手持系统",
     "versionName" : "1.0.0",
     "versionCode" : 100,
     "transformPx" : false,
diff --git a/pages.json b/pages.json
index f5feb9d..83ca99a 100644
--- a/pages.json
+++ b/pages.json
@@ -328,6 +328,20 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/hdyy/scgl/by-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/nbz-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
         ,{
             "path" : "pages/hdyy/scgl/lt-weight",
             "style" :                                                                                    
@@ -349,6 +363,41 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/hdyy/scgl/fs-xialiao",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/yp-xialiao",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/by-xialiao",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/md-xialiao",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/cm-xialiao",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
         ,{
             "path" : "pages/hdyy/scgl/sl-huiku",
             "style" :                                                                                    
@@ -363,6 +412,41 @@
                 "navigationStyle": "custom"
             }
         }
+        ,{
+            "path" : "pages/hdyy/scgl/cz-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/fs-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/zl-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/py-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/hdyy/scgl/cm-callmater",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
         ,{
             "path" : "pages/hdyy/scgl/yjg-chuliao",
             "style" :                                                                                    
diff --git a/pages/hdyy/scgl/by-callmater.vue b/pages/hdyy/scgl/by-callmater.vue
new file mode 100644
index 0000000..a246e2c
--- /dev/null
+++ b/pages/hdyy/scgl/by-callmater.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="zd_container">
+		<!-- 料桶叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getBucketGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !checkedArr.length}" :disabled="disabled" @tap="_confirmCallBucketMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getBucketGroupInfo, confirmCallBucketMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				num: null,
+				val1: '',
+				val2: '',
+				materialData: {},
+				allCheck: false,
+				checkedArr: [],
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.checkedArr = []
+				this.allCheck = false
+				this.dataList = []
+				this.disabled = false
+			},
+			toAllCheck () {
+				this.allCheck = !this.allCheck
+				this.dataList.map(el => {
+					el.checked = this.allCheck
+				})
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.allCheck = this.checkedArr.length === this.dataList.length
+			},
+			async _getBucketGroupInfo () {
+				try {
+					let res = await getBucketGroupInfo(this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallBucketMaterial () {
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.disabled = true
+				if (!this.val2 || !this.checkedArr.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallBucketMaterial(this.val2, this.checkedArr)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/by-xialiao.vue b/pages/hdyy/scgl/by-xialiao.vue
new file mode 100644
index 0000000..e9c79ea
--- /dev/null
+++ b/pages/hdyy/scgl/by-xialiao.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<!-- 包衣下料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">总数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>袋号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>出库数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>点位</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.bag_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				num: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.dataList = []
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupBucketInfo()
+				}
+			},
+			async _getGroupBucketInfo () {
+				try {
+					let res = await getGroupBucketInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _productionLine (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await productionLine(this.val1, this.val2, type)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/cm-callmater.vue b/pages/hdyy/scgl/cm-callmater.vue
new file mode 100644
index 0000000..af7603a
--- /dev/null
+++ b/pages/hdyy/scgl/cm-callmater.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 缠膜叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				num: null,
+				index: '',
+				val1: '',
+				val2: '',
+				materialData: {},
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.num = null
+				this.dataList = []
+				this.checkedArr = []
+				this.allCheck = false
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _getStockGroupInfo () {
+				try {
+					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallMaterial () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/cm-xialiao.vue b/pages/hdyy/scgl/cm-xialiao.vue
new file mode 100644
index 0000000..6f65a06
--- /dev/null
+++ b/pages/hdyy/scgl/cm-xialiao.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<!-- 缠膜下料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">总数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>袋号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>出库数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>点位</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.bag_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				num: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.dataList = []
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupBucketInfo()
+				}
+			},
+			async _getGroupBucketInfo () {
+				try {
+					let res = await getGroupBucketInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _productionLine (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await productionLine(this.val1, this.val2, type)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/cz-callmater.vue b/pages/hdyy/scgl/cz-callmater.vue
new file mode 100644
index 0000000..e46aae1
--- /dev/null
+++ b/pages/hdyy/scgl/cz-callmater.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 称量叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				num: null,
+				index: '',
+				val1: '',
+				val2: '',
+				materialData: {},
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.num = null
+				this.dataList = []
+				this.checkedArr = []
+				this.allCheck = false
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _getStockGroupInfo () {
+				try {
+					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallMaterial () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/fs-callmater.vue b/pages/hdyy/scgl/fs-callmater.vue
new file mode 100644
index 0000000..a81e216
--- /dev/null
+++ b/pages/hdyy/scgl/fs-callmater.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 粉碎叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				num: null,
+				index: '',
+				val1: '',
+				val2: '',
+				materialData: {},
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.num = null
+				this.dataList = []
+				this.checkedArr = []
+				this.allCheck = false
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _getStockGroupInfo () {
+				try {
+					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallMaterial () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/fs-xialiao.vue b/pages/hdyy/scgl/fs-xialiao.vue
new file mode 100644
index 0000000..4ca378e
--- /dev/null
+++ b/pages/hdyy/scgl/fs-xialiao.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<!-- 粉碎下料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">总数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>袋号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>出库数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>点位</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.bag_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				num: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.dataList = []
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupBucketInfo()
+				}
+			},
+			async _getGroupBucketInfo () {
+				try {
+					let res = await getGroupBucketInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _productionLine (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await productionLine(this.val1, this.val2, type)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/md-xialiao.vue b/pages/hdyy/scgl/md-xialiao.vue
new file mode 100644
index 0000000..395bafa
--- /dev/null
+++ b/pages/hdyy/scgl/md-xialiao.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<!-- 码垛下料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">总数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>袋号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>出库数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>点位</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.bag_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				num: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.dataList = []
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupBucketInfo()
+				}
+			},
+			async _getGroupBucketInfo () {
+				try {
+					let res = await getGroupBucketInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _productionLine (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await productionLine(this.val1, this.val2, type)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/nbz-callmater.vue b/pages/hdyy/scgl/nbz-callmater.vue
new file mode 100644
index 0000000..ea10c86
--- /dev/null
+++ b/pages/hdyy/scgl/nbz-callmater.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="zd_container">
+		<!-- 内包装叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getBucketGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !checkedArr.length}" :disabled="disabled" @tap="_confirmCallBucketMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getBucketGroupInfo, confirmCallBucketMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				num: null,
+				val1: '',
+				val2: '',
+				materialData: {},
+				allCheck: false,
+				checkedArr: [],
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.checkedArr = []
+				this.allCheck = false
+				this.dataList = []
+				this.disabled = false
+			},
+			toAllCheck () {
+				this.allCheck = !this.allCheck
+				this.dataList.map(el => {
+					el.checked = this.allCheck
+				})
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.allCheck = this.checkedArr.length === this.dataList.length
+			},
+			async _getBucketGroupInfo () {
+				try {
+					let res = await getBucketGroupInfo(this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallBucketMaterial () {
+				this.checkedArr = this.dataList.filter(el => el.checked === true)
+				this.disabled = true
+				if (!this.val2 || !this.checkedArr.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallBucketMaterial(this.val2, this.checkedArr)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/py-callmater.vue b/pages/hdyy/scgl/py-callmater.vue
new file mode 100644
index 0000000..d89d020
--- /dev/null
+++ b/pages/hdyy/scgl/py-callmater.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 配液叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				num: null,
+				index: '',
+				val1: '',
+				val2: '',
+				materialData: {},
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.num = null
+				this.dataList = []
+				this.checkedArr = []
+				this.allCheck = false
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _getStockGroupInfo () {
+				try {
+					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallMaterial () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/yp-xialiao.vue b/pages/hdyy/scgl/yp-xialiao.vue
new file mode 100644
index 0000000..806cad3
--- /dev/null
+++ b/pages/hdyy/scgl/yp-xialiao.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="zd_container">
+		<!-- 压片下料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">总数量</span>
+					</view>
+					<view class="zd-col-24">
+						<input type="number" v-model="num" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>袋号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>出库数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>点位</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{i+1}}</td>
+								<td>{{e.bag_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('1')">呼叫agv</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_productionLine('0')">下料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getGroupBucketInfo, productionLine} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				num: null,
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.num = null
+				this.dataList = []
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			handleChange (e) {
+				if (e) {
+					this._getGroupBucketInfo()
+				}
+			},
+			async _getGroupBucketInfo () {
+				try {
+					let res = await getGroupBucketInfo(this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+						this.num = this.dataList.reduce((sum, item) => sum + Number(item.qty), 0)
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _productionLine (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await productionLine(this.val1, this.val2, type)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/hdyy/scgl/zl-callmater.vue b/pages/hdyy/scgl/zl-callmater.vue
new file mode 100644
index 0000000..4541187
--- /dev/null
+++ b/pages/hdyy/scgl/zl-callmater.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="zd_container">
+		<!-- 制粒叫料 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="materialData.material_code"/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">批号</span>
+					</view>
+					<view class="zd-col-14 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" @tap="_getStockGroupInfo">查询</button>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">要料点</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>点位</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>数量</th>
+								<th>单位</th>
+								<th>供应商</th>
+								<th>类别</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.group_id === pkId}" @tap="toCheck(e)">
+								<td>{{i+1}}</td>
+								<td>{{e.struct_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.qty_unit_name}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{e.class_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_model}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !val2 || !pkId}" :disabled="disabled" @tap="_confirmCallMaterial">确认叫料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStockGroupInfo, confirmCallMaterial} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				num: null,
+				index: '',
+				val1: '',
+				val2: '',
+				materialData: {},
+				pkId: '',
+				pkObj: {},
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.materialData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.pkObj = this.pkId === e.group_id ? e : {}
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/hdyy/wbc/${name}`
+				})
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.num = null
+				this.dataList = []
+				this.checkedArr = []
+				this.allCheck = false
+				this.disabled = false
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			async _getStockGroupInfo () {
+				try {
+					let res = await getStockGroupInfo('', this.materialData.material_id, this.val1)
+					if (res && res.data.length > 0) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _confirmCallMaterial () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmCallMaterial(this.val2, this.pkObj)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 46f73ee..11e22fe 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -5,7 +5,7 @@
 			<view class="userInfo-wrap">
 				<view class="userInfo">
 					<text v-if="userName !== ''" class="p1">{{userName}}</text>
-					<text class="p2">欢迎进入华东制药LMS手持系统！</text>
+					<text class="p2">欢迎进入华东医药LMS手持系统！</text>
 				</view>
 				<view class="exit" @tap="Quit">
 					<view class="icon-exit"></view>
@@ -87,11 +87,23 @@
 					{title: '生产管理', path: 'RF04', sonTree: [
 						{title: '成品出料', path: '/pages/hdyy/scgl/cp-chuliao'},
 						{title: '料桶叫料', path: '/pages/hdyy/scgl/lt-callmater'},
+						{title: '包衣叫料', path: '/pages/hdyy/scgl/by-callmater'},
+						{title: '内包装叫料', path: '/pages/hdyy/scgl/nbz-callmater'},
 						{title: '料桶称重', path: '/pages/hdyy/scgl/lt-weight'}, 
 						{title: '点位取货', path: '/pages/hdyy/scgl/point-quhuo'},
 						{title: '生产出料', path: '/pages/hdyy/scgl/sc-chuliao'},
+						{title: '粉碎下料', path: '/pages/hdyy/scgl/fs-xialiao'},
+						{title: '压片下料', path: '/pages/hdyy/scgl/yp-xialiao'},
+						{title: '包衣下料', path: '/pages/hdyy/scgl/by-xialiao'},
+						{title: '码垛下料', path: '/pages/hdyy/scgl/md-xialiao'},
+						{title: '缠膜下料', path: '/pages/hdyy/scgl/cm-xialiao'},
 						{title: '剩料回库', path: '/pages/hdyy/scgl/sl-huiku'},
 						{title: '托盘叫料', path: '/pages/hdyy/scgl/tp-callmater'},
+						{title: '称量叫料', path: '/pages/hdyy/scgl/cz-callmater'},
+						{title: '粉碎叫料', path: '/pages/hdyy/scgl/fs-callmater'},
+						{title: '制粒叫料', path: '/pages/hdyy/scgl/zl-callmater'},
+						{title: '配液叫料', path: '/pages/hdyy/scgl/py-callmater'},
+						{title: '缠膜叫料', path: '/pages/hdyy/scgl/cm-callmater'},
 						{title: '预加工出料', path: '/pages/hdyy/scgl/yjg-chuliao'}
 					]},
 					{title: '外包材管理', path: 'RF05', sonTree: [
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4174c15..dec1568 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_content bg">
 		<view class="p1">欢迎来到</view>
-		<view class="p2">华东制药LMS手持系统！</view>
+		<view class="p2">华东医药LMS手持系统！</view>
 		<view class="input-box">
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 444d66b..5dc1568 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,8 +1,8 @@
 import * as types from '../types'
 
 const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
-const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
-const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.4:8000' : 'http://192.168.18.4:8000'
+const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
+const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.70:8011' : 'http://192.168.10.70:8011'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
 	acsUrl: uni.getStorageSync('acsUrl') || acsUrl,