Browse Source

feat(味魔方数据下发): 味魔方数据下发

味魔方数据下发
tags/小炒逻辑变更前
txb 2 years ago
parent
commit
701ae97a0a
6 changed files with 11 additions and 10 deletions
  1. +1
    -1
      src/pages/device/deviceInfo/components/CreateForm.jsx
  2. +1
    -1
      src/pages/device/deviceInfo/index.jsx
  3. +1
    -1
      src/pages/device/deviceRecipeStock/components/CreateForm.jsx
  4. +3
    -2
      src/pages/device/deviceRecipeStock/index.jsx
  5. +4
    -4
      src/pages/quickStart/components/DeviceConfig/index.jsx
  6. +1
    -1
      src/pages/sys/deviceTypeConfig/index.jsx

+ 1
- 1
src/pages/device/deviceInfo/components/CreateForm.jsx View File

@@ -93,7 +93,7 @@ const CreateForm = (props) => {
</OptGroup>
</Select>
</Form.Item>
<Form.Item label={'设备物料数量'} name="materialQuantity">
<Form.Item label={'设备通道数量'} name="materialQuantity">
<InputNumber />
</Form.Item>
<Form.Item label={'设备详细地址'} name="deviceAddr">


+ 1
- 1
src/pages/device/deviceInfo/index.jsx View File

@@ -231,7 +231,7 @@ const GoodsTypeManage = () => {
search: false,
},
{
title: '设备物料数量',
title: '设备通道数量',
dataIndex: 'materialQuantity',
valueType: 'textarea',
search: false,


+ 1
- 1
src/pages/device/deviceRecipeStock/components/CreateForm.jsx View File

@@ -74,7 +74,7 @@ const CreateForm = (props) => {
{
(() => {
const selectArray = [];
for (let index = 1; index <= 14; index++) {
for (let index = 1; index <= props.materialQuantity; index++) {
selectArray.push(<Select.Option index={index} value={index} key={index}>
{index}
</Select.Option>);


+ 3
- 2
src/pages/device/deviceRecipeStock/index.jsx View File

@@ -26,9 +26,9 @@ const DeviceStockManager = (props) => {
const [selectedRowsState, setSelectedRows] = useState([]);
const [total, setTotal] = useState(0);

const [materialQuantity, setmaterialQuantity] = useState();
//添加
const handleAdd = async (fields) => {
console.log("fdsfdas",props.values.type);
try {
fields.DeviceId = props.values.key;
fields.type = props.values.type;
@@ -95,7 +95,6 @@ const DeviceStockManager = (props) => {

//获取实时库存
const handleCheckStockAdjust = async (id) => {
console.log("fdsfds");
try {
if (props.isbom) {
await CheckStockTMCAdjust(id).then((r) => {
@@ -290,6 +289,7 @@ const DeviceStockManager = (props) => {
key="primary"
onClick={() => {
handleModalVisible(true);
setmaterialQuantity(typeof(props.values)=='undefined'?14:props.values.materialQuantity==0?14:props.values.materialQuantity)
}}
>
<PlusOutlined /> 新增库存原料
@@ -342,6 +342,7 @@ const DeviceStockManager = (props) => {
}}
createModalVisible={createModalVisible}
values={currentRow || {}}
materialQuantity={materialQuantity}
/>
</PageContainer>
</Modal>


+ 4
- 4
src/pages/quickStart/components/DeviceConfig/index.jsx View File

@@ -35,7 +35,7 @@ const DeviceConfig = (props) => {

/**
* 提交表单
* @param {*} formValues
* @param {*} formValues
*/
const onFinishSubmit = async (formValues) => {
message.loading('正在配置', key);
@@ -188,7 +188,7 @@ const DeviceConfig = (props) => {
search: false,
},
{
title: '设备物料数量',
title: '设备通道数量',
dataIndex: 'materialQuantity',
valueType: 'textarea',
search: false,
@@ -369,7 +369,7 @@ const DeviceConfig = (props) => {
</Select>
</Form.Item>

<Form.Item label={'设备物料数量'} name="materialQuantity">
<Form.Item label={'设备通道数量'} name="materialQuantity">
<InputNumber style={{ width: '100%' }} />
</Form.Item>

@@ -408,4 +408,4 @@ const DeviceConfig = (props) => {
</>
}

export default DeviceConfig;
export default DeviceConfig;

+ 1
- 1
src/pages/sys/deviceTypeConfig/index.jsx View File

@@ -165,7 +165,7 @@ const ConfigDataManage = () => {
}}
>
{' '}
置设备配方
备做法
</a>,
<a
onClick={() => {


Loading…
Cancel
Save