Merge branch 'main' of http://jialcheerful.club:3000/xd/JNBusiness
This commit is contained in:
commit
1144d37b31
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<name>ruoyi</name>
|
<name>ruoyi</name>
|
||||||
<url>http://www.ruoyi.vip</url>
|
<url>http://www.ruoyi.vip</url>
|
||||||
<description>若依管理系统</description>
|
<description>江南业务系统</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<ruoyi.version>3.8.7</ruoyi.version>
|
<ruoyi.version>3.8.7</ruoyi.version>
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class batchInsert extends JFrame {
|
||||||
/*stmt = conn.prepareStatement(
|
/*stmt = conn.prepareStatement(
|
||||||
"insert into [dbo].[sapcontract_test](uid,bh,type,custom,salesman,project,htje,startdate,enddate,remark,htzt) values (?,?,?,?,?,?,?,?,?,?,?)");*/
|
"insert into [dbo].[sapcontract_test](uid,bh,type,custom,salesman,project,htje,startdate,enddate,remark,htzt) values (?,?,?,?,?,?,?,?,?,?,?)");*/
|
||||||
stmt = conn.prepareStatement(
|
stmt = conn.prepareStatement(
|
||||||
"insert into c_material(material_id, material_xingh, material_guig, material_diany, material_dw) values (?,?,?,?,?)");
|
"insert into c_material(material_id, material_xingh, material_guig, material_diany, material_dw,material_type_id) values (?,?,?,?,?,?)");
|
||||||
int count = 0;
|
int count = 0;
|
||||||
System.err.println("Start");
|
System.err.println("Start");
|
||||||
for (material pay : list) {
|
for (material pay : list) {
|
||||||
|
@ -36,6 +36,7 @@ public class batchInsert extends JFrame {
|
||||||
stmt.setString(3, pay.getMaterial_guig());
|
stmt.setString(3, pay.getMaterial_guig());
|
||||||
stmt.setString(4, pay.getMaterial_diany());
|
stmt.setString(4, pay.getMaterial_diany());
|
||||||
stmt.setString(5, pay.getMaterial_dw());
|
stmt.setString(5, pay.getMaterial_dw());
|
||||||
|
stmt.setString(6, pay.getMaterial_type_id());
|
||||||
|
|
||||||
stmt.addBatch();
|
stmt.addBatch();
|
||||||
if (count % 5000 == 0) {// 当增加了500个批处理的时候再提交
|
if (count % 5000 == 0) {// 当增加了500个批处理的时候再提交
|
||||||
|
|
|
@ -328,8 +328,6 @@ public class SysUserController extends BaseController
|
||||||
List<List<temp>> averageAssign = ListUtils.partition(templist, 5000);
|
List<List<temp>> averageAssign = ListUtils.partition(templist, 5000);
|
||||||
|
|
||||||
|
|
||||||
*//*List<temp> list = averageAssign.get(0);*//*
|
|
||||||
|
|
||||||
int num = 1;
|
int num = 1;
|
||||||
int num2 = 1;
|
int num2 = 1;
|
||||||
for(List<temp> list:averageAssign){
|
for(List<temp> list:averageAssign){
|
||||||
|
@ -340,13 +338,10 @@ public class SysUserController extends BaseController
|
||||||
m.setMaterial_guig(t.getSpec_1());
|
m.setMaterial_guig(t.getSpec_1());
|
||||||
m.setMaterial_diany(t.getVoltage_1());
|
m.setMaterial_diany(t.getVoltage_1());
|
||||||
m.setMaterial_dw(t.getUnit_0());
|
m.setMaterial_dw(t.getUnit_0());
|
||||||
|
m.setMaterial_type_id(t.getType_no());
|
||||||
materials.add(m);
|
materials.add(m);
|
||||||
num++;
|
num++;
|
||||||
|
|
||||||
*//*
|
|
||||||
for(int i=1;i<63;i++){
|
|
||||||
*//*
|
|
||||||
|
|
||||||
if("M001".equals(t.getM_id_M001())){
|
if("M001".equals(t.getM_id_M001())){
|
||||||
c = new cost();
|
c = new cost();
|
||||||
c.setCost_id(num2);
|
c.setCost_id(num2);
|
||||||
|
@ -386,6 +381,7 @@ public class SysUserController extends BaseController
|
||||||
c.setCost_material_id(m.getMaterial_id());
|
c.setCost_material_id(m.getMaterial_id());
|
||||||
c.setCost_cl_id(t.getM_id_M005());
|
c.setCost_cl_id(t.getM_id_M005());
|
||||||
c.setCost_cl_qty(t.getName_qty_M005());
|
c.setCost_cl_qty(t.getName_qty_M005());
|
||||||
|
c.setCost_cl_qty_2(t.getName_qty_M005_1());
|
||||||
costs.add(c);num2++;
|
costs.add(c);num2++;
|
||||||
}
|
}
|
||||||
if("M006".equals(t.getM_id_M006())){
|
if("M006".equals(t.getM_id_M006())){
|
||||||
|
@ -848,19 +844,45 @@ public class SysUserController extends BaseController
|
||||||
c.setCost_cl_qty(t.getName_qty_M064());
|
c.setCost_cl_qty(t.getName_qty_M064());
|
||||||
costs.add(c);num2++;
|
costs.add(c);num2++;
|
||||||
}
|
}
|
||||||
|
if("M065".equals(t.getM_id_M065())){
|
||||||
*//* }*//*
|
c = new cost();
|
||||||
|
c.setCost_id(num2);
|
||||||
|
c.setCost_material_id(m.getMaterial_id());
|
||||||
|
c.setCost_cl_id(t.getM_id_M065());
|
||||||
|
c.setCost_cl_qty(t.getName_qty_M065());
|
||||||
|
costs.add(c);num2++;
|
||||||
|
}
|
||||||
|
if("M066".equals(t.getM_id_M066())){
|
||||||
|
c = new cost();
|
||||||
|
c.setCost_id(num2);
|
||||||
|
c.setCost_material_id(m.getMaterial_id());
|
||||||
|
c.setCost_cl_id(t.getM_id_M066());
|
||||||
|
c.setCost_cl_qty(t.getName_qty_M066());
|
||||||
|
costs.add(c);num2++;
|
||||||
|
}
|
||||||
|
if("M067".equals(t.getM_id_M067())){
|
||||||
|
c = new cost();
|
||||||
|
c.setCost_id(num2);
|
||||||
|
c.setCost_material_id(m.getMaterial_id());
|
||||||
|
c.setCost_cl_id(t.getM_id_M067());
|
||||||
|
c.setCost_cl_qty(t.getName_qty_M067());
|
||||||
|
costs.add(c);num2++;
|
||||||
|
}
|
||||||
|
if("M068".equals(t.getM_id_M068())){
|
||||||
|
c = new cost();
|
||||||
|
c.setCost_id(num2);
|
||||||
|
c.setCost_material_id(m.getMaterial_id());
|
||||||
|
c.setCost_cl_id(t.getM_id_M068());
|
||||||
|
c.setCost_cl_qty(t.getName_qty_M068());
|
||||||
|
costs.add(c);num2++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
System.out.println("materials===================="+materials.size());
|
System.out.println("materials===================="+materials.size());
|
||||||
System.out.println("costs======================="+costs.size());
|
System.out.println("costs======================="+costs.size());
|
||||||
|
|
||||||
*//*insertMaterialBatch(materials);
|
|
||||||
insertCostBatch(costs);*//*
|
|
||||||
batchInsert.insertMaterialBatch(materials);
|
batchInsert.insertMaterialBatch(materials);
|
||||||
batchInsert.insertCostBatch(costs);
|
batchInsert.insertCostBatch(costs);
|
||||||
}*/
|
}*/
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class SwaggerConfig
|
||||||
// 用ApiInfoBuilder进行定制
|
// 用ApiInfoBuilder进行定制
|
||||||
return new ApiInfoBuilder()
|
return new ApiInfoBuilder()
|
||||||
// 设置标题
|
// 设置标题
|
||||||
.title("标题:若依管理系统_接口文档")
|
.title("标题:江南业务系统_接口文档")
|
||||||
// 描述
|
// 描述
|
||||||
.description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
|
.description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
|
||||||
// 作者信息
|
// 作者信息
|
||||||
|
|
|
@ -61,7 +61,7 @@ public class CFactory extends BaseEntity
|
||||||
private BigDecimal factoryTotalRatio;
|
private BigDecimal factoryTotalRatio;
|
||||||
|
|
||||||
/** 物料类别信息 */
|
/** 物料类别信息 */
|
||||||
private List<CMaterialType> cMaterialTypeList;
|
private List<CMaterialTypeFactory> cMaterialTypeList;
|
||||||
|
|
||||||
public void setFactoryId(Long factoryId)
|
public void setFactoryId(Long factoryId)
|
||||||
{
|
{
|
||||||
|
@ -158,12 +158,12 @@ public class CFactory extends BaseEntity
|
||||||
|
|
||||||
public void setFactoryPjRatio(BigDecimal factoryPjRatio) {this.factoryPjRatio = factoryPjRatio;}
|
public void setFactoryPjRatio(BigDecimal factoryPjRatio) {this.factoryPjRatio = factoryPjRatio;}
|
||||||
|
|
||||||
public List<CMaterialType> getCMaterialTypeList()
|
public List<CMaterialTypeFactory> getCMaterialTypeList()
|
||||||
{
|
{
|
||||||
return cMaterialTypeList;
|
return cMaterialTypeList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCMaterialTypeList(List<CMaterialType> cMaterialTypeList){this.cMaterialTypeList = cMaterialTypeList;}
|
public void setCMaterialTypeList(List<CMaterialTypeFactory> cMaterialTypeList){this.cMaterialTypeList = cMaterialTypeList;}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
|
|
@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
* @date 2024-02-29
|
* @date 2024-02-29
|
||||||
*/
|
*/
|
||||||
public class CMaterialType extends BaseEntity
|
public class CMaterialTypeFactory extends BaseEntity
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@ -26,8 +26,8 @@ public class CMaterialType extends BaseEntity
|
||||||
@Excel(name = "名称")
|
@Excel(name = "名称")
|
||||||
private String typeName;
|
private String typeName;
|
||||||
|
|
||||||
/** 关联车间id */
|
/** 关联车间编码 */
|
||||||
private Long factoryId;
|
private String factoryId;
|
||||||
|
|
||||||
public void setTypeId(Long typeId)
|
public void setTypeId(Long typeId)
|
||||||
{
|
{
|
||||||
|
@ -56,12 +56,12 @@ public class CMaterialType extends BaseEntity
|
||||||
{
|
{
|
||||||
return typeName;
|
return typeName;
|
||||||
}
|
}
|
||||||
public void setFactoryId(Long factoryId)
|
public void setFactoryId(String factoryId)
|
||||||
{
|
{
|
||||||
this.factoryId = factoryId;
|
this.factoryId = factoryId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getFactoryId()
|
public String getFactoryId()
|
||||||
{
|
{
|
||||||
return factoryId;
|
return factoryId;
|
||||||
}
|
}
|
|
@ -2,7 +2,7 @@ package com.ruoyi.factory.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import com.ruoyi.factory.domain.CFactory;
|
import com.ruoyi.factory.domain.CFactory;
|
||||||
import com.ruoyi.factory.domain.CMaterialType;
|
import com.ruoyi.factory.domain.CMaterialTypeFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 车间管理Mapper接口
|
* 车间管理Mapper接口
|
||||||
|
@ -74,7 +74,7 @@ public interface CFactoryMapper
|
||||||
* @param cMaterialTypeList 物料类别列表
|
* @param cMaterialTypeList 物料类别列表
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int batchCMaterialType(List<CMaterialType> cMaterialTypeList);
|
public int batchCMaterialType(List<CMaterialTypeFactory> cMaterialTypeList);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -83,10 +83,10 @@ public interface CFactoryMapper
|
||||||
* @param factoryId 车间管理ID
|
* @param factoryId 车间管理ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int deleteCMaterialTypeByFactoryId(Long factoryId);
|
public int deleteCMaterialTypeByFactoryId(String factoryId);
|
||||||
|
|
||||||
/*物料类别列表*/
|
/*物料类别列表*/
|
||||||
List<CMaterialType> selectCTypelist();
|
List<CMaterialTypeFactory> selectCTypelist();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验车间编码是否存在
|
* 校验车间编码是否存在
|
||||||
|
|
|
@ -2,14 +2,13 @@ package com.ruoyi.factory.service.impl;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.ruoyi.clMaterial.domain.CYlMaterial;
|
|
||||||
import com.ruoyi.common.constant.UserConstants;
|
import com.ruoyi.common.constant.UserConstants;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import com.ruoyi.factory.domain.CMaterialType;
|
import com.ruoyi.factory.domain.CMaterialTypeFactory;
|
||||||
import com.ruoyi.factory.mapper.CFactoryMapper;
|
import com.ruoyi.factory.mapper.CFactoryMapper;
|
||||||
import com.ruoyi.factory.domain.CFactory;
|
import com.ruoyi.factory.domain.CFactory;
|
||||||
import com.ruoyi.factory.service.ICFactoryService;
|
import com.ruoyi.factory.service.ICFactoryService;
|
||||||
|
@ -52,7 +51,7 @@ public class CFactoryServiceImpl implements ICFactoryService
|
||||||
|
|
||||||
/*物料类别列表*/
|
/*物料类别列表*/
|
||||||
@Override
|
@Override
|
||||||
public List<CMaterialType> selectCTypelist() {
|
public List<CMaterialTypeFactory> selectCTypelist() {
|
||||||
return cFactoryMapper.selectCTypelist();
|
return cFactoryMapper.selectCTypelist();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +80,7 @@ public class CFactoryServiceImpl implements ICFactoryService
|
||||||
@Override
|
@Override
|
||||||
public int updateCFactory(CFactory cFactory)
|
public int updateCFactory(CFactory cFactory)
|
||||||
{
|
{
|
||||||
cFactoryMapper.deleteCMaterialTypeByFactoryId(cFactory.getFactoryId());
|
cFactoryMapper.deleteCMaterialTypeByFactoryId(cFactory.getFactoryNo());
|
||||||
insertCMaterialType(cFactory);
|
insertCMaterialType(cFactory);
|
||||||
return cFactoryMapper.updateCFactory(cFactory);
|
return cFactoryMapper.updateCFactory(cFactory);
|
||||||
}
|
}
|
||||||
|
@ -110,7 +109,8 @@ public class CFactoryServiceImpl implements ICFactoryService
|
||||||
@Override
|
@Override
|
||||||
public int deleteCFactoryByFactoryId(Long factoryId)
|
public int deleteCFactoryByFactoryId(Long factoryId)
|
||||||
{
|
{
|
||||||
cFactoryMapper.deleteCMaterialTypeByFactoryId(factoryId);
|
CFactory f = cFactoryMapper.selectCFactoryByFactoryId(factoryId);
|
||||||
|
cFactoryMapper.deleteCMaterialTypeByFactoryId(f.getFactoryNo());
|
||||||
return cFactoryMapper.deleteCFactoryByFactoryId(factoryId);
|
return cFactoryMapper.deleteCFactoryByFactoryId(factoryId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -121,14 +121,14 @@ public class CFactoryServiceImpl implements ICFactoryService
|
||||||
*/
|
*/
|
||||||
public void insertCMaterialType(CFactory cFactory)
|
public void insertCMaterialType(CFactory cFactory)
|
||||||
{
|
{
|
||||||
List<CMaterialType> cMaterialTypeList = cFactory.getCMaterialTypeList();
|
List<CMaterialTypeFactory> cMaterialTypeList = cFactory.getCMaterialTypeList();
|
||||||
Long factoryId = cFactory.getFactoryId();
|
String factoryNo = cFactory.getFactoryNo();
|
||||||
if (StringUtils.isNotNull(cMaterialTypeList))
|
if (StringUtils.isNotNull(cMaterialTypeList))
|
||||||
{
|
{
|
||||||
List<CMaterialType> list = new ArrayList<CMaterialType>();
|
List<CMaterialTypeFactory> list = new ArrayList<CMaterialTypeFactory>();
|
||||||
for (CMaterialType cMaterialType : cMaterialTypeList)
|
for (CMaterialTypeFactory cMaterialType : cMaterialTypeList)
|
||||||
{
|
{
|
||||||
cMaterialType.setFactoryId(factoryId);
|
cMaterialType.setFactoryId(factoryNo);
|
||||||
list.add(cMaterialType);
|
list.add(cMaterialType);
|
||||||
}
|
}
|
||||||
if (list.size() > 0)
|
if (list.size() > 0)
|
||||||
|
|
|
@ -20,8 +20,8 @@ public class CMaterial extends BaseEntity
|
||||||
/** id */
|
/** id */
|
||||||
private Long materialId;
|
private Long materialId;
|
||||||
|
|
||||||
/** 关联物料类型id */
|
/** 关联物料类型编码 */
|
||||||
private Long materialTypeId;
|
private String materialTypeId;
|
||||||
|
|
||||||
/** 型号 */
|
/** 型号 */
|
||||||
@Excel(name = "型号")
|
@Excel(name = "型号")
|
||||||
|
@ -56,11 +56,11 @@ public class CMaterial extends BaseEntity
|
||||||
return materialId;
|
return materialId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getMaterialTypeId() {
|
public String getMaterialTypeId() {
|
||||||
return materialTypeId;
|
return materialTypeId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMaterialTypeId(Long materialTypeId) {
|
public void setMaterialTypeId(String materialTypeId) {
|
||||||
this.materialTypeId = materialTypeId;
|
this.materialTypeId = materialTypeId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ import org.apache.ibatis.type.Alias;
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
* @date 2024-03-01
|
* @date 2024-03-01
|
||||||
*/
|
*/
|
||||||
@Alias("c_mtype")
|
|
||||||
public class CMaterialType extends BaseEntity
|
public class CMaterialType extends BaseEntity
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -28,9 +27,6 @@ public class CMaterialType extends BaseEntity
|
||||||
@Excel(name = "名称")
|
@Excel(name = "名称")
|
||||||
private String typeName;
|
private String typeName;
|
||||||
|
|
||||||
/** 关联车间id */
|
|
||||||
private Long factoryId;
|
|
||||||
|
|
||||||
public void setTypeId(Long typeId)
|
public void setTypeId(Long typeId)
|
||||||
{
|
{
|
||||||
this.typeId = typeId;
|
this.typeId = typeId;
|
||||||
|
@ -58,15 +54,6 @@ public class CMaterialType extends BaseEntity
|
||||||
{
|
{
|
||||||
return typeName;
|
return typeName;
|
||||||
}
|
}
|
||||||
public void setFactoryId(Long factoryId)
|
|
||||||
{
|
|
||||||
this.factoryId = factoryId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getFactoryId()
|
|
||||||
{
|
|
||||||
return factoryId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
@ -74,7 +61,6 @@ public class CMaterialType extends BaseEntity
|
||||||
.append("typeId", getTypeId())
|
.append("typeId", getTypeId())
|
||||||
.append("typeNo", getTypeNo())
|
.append("typeNo", getTypeNo())
|
||||||
.append("typeName", getTypeName())
|
.append("typeName", getTypeName())
|
||||||
.append("factoryId", getFactoryId())
|
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ public class material {
|
||||||
private String material_guig;
|
private String material_guig;
|
||||||
private String material_diany;
|
private String material_diany;
|
||||||
private String material_dw;
|
private String material_dw;
|
||||||
|
private String material_type_id;
|
||||||
|
|
||||||
public String getMaterial_xingh() {
|
public String getMaterial_xingh() {
|
||||||
return material_xingh;
|
return material_xingh;
|
||||||
|
@ -46,4 +47,12 @@ public class material {
|
||||||
public void setMaterial_id(Integer material_id) {
|
public void setMaterial_id(Integer material_id) {
|
||||||
this.material_id = material_id;
|
this.material_id = material_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getMaterial_type_id() {
|
||||||
|
return material_type_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMaterial_type_id(String material_type_id) {
|
||||||
|
this.material_type_id = material_type_id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.ruoyi.system.domain;
|
package com.ruoyi.system.domain;
|
||||||
|
|
||||||
public class temp {
|
public class temp {
|
||||||
|
private String type_no;
|
||||||
private String model_0;
|
private String model_0;
|
||||||
private String model_1;
|
private String model_1;
|
||||||
private String spec_0;
|
private String spec_0;
|
||||||
|
@ -20,6 +21,7 @@ public class temp {
|
||||||
private String name_qty_M004_1;
|
private String name_qty_M004_1;
|
||||||
private String m_id_M005;
|
private String m_id_M005;
|
||||||
private String name_qty_M005;
|
private String name_qty_M005;
|
||||||
|
private String name_qty_M005_1;
|
||||||
private String m_id_M006;
|
private String m_id_M006;
|
||||||
private String name_qty_M006;
|
private String name_qty_M006;
|
||||||
private String m_id_M007;
|
private String m_id_M007;
|
||||||
|
@ -148,6 +150,26 @@ public class temp {
|
||||||
private String m_id_M064;
|
private String m_id_M064;
|
||||||
private String name_qty_M064;
|
private String name_qty_M064;
|
||||||
|
|
||||||
|
private String m_id_M065;
|
||||||
|
private String name_qty_M065;
|
||||||
|
|
||||||
|
private String m_id_M066;
|
||||||
|
private String name_qty_M066;
|
||||||
|
|
||||||
|
private String m_id_M067;
|
||||||
|
private String name_qty_M067;
|
||||||
|
|
||||||
|
private String m_id_M068;
|
||||||
|
private String name_qty_M068;
|
||||||
|
|
||||||
|
public String getType_no() {
|
||||||
|
return type_no;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setType_no(String type_no) {
|
||||||
|
this.type_no = type_no;
|
||||||
|
}
|
||||||
|
|
||||||
public String getModel_0() {
|
public String getModel_0() {
|
||||||
return model_0;
|
return model_0;
|
||||||
}
|
}
|
||||||
|
@ -292,6 +314,14 @@ public class temp {
|
||||||
this.name_qty_M005 = name_qty_M005;
|
this.name_qty_M005 = name_qty_M005;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getName_qty_M005_1() {
|
||||||
|
return name_qty_M005_1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName_qty_M005_1(String name_qty_M005_1) {
|
||||||
|
this.name_qty_M005_1 = name_qty_M005_1;
|
||||||
|
}
|
||||||
|
|
||||||
public String getM_id_M006() {
|
public String getM_id_M006() {
|
||||||
return m_id_M006;
|
return m_id_M006;
|
||||||
}
|
}
|
||||||
|
@ -1299,4 +1329,68 @@ public class temp {
|
||||||
public void setName_qty_M048_1(String name_qty_M048_1) {
|
public void setName_qty_M048_1(String name_qty_M048_1) {
|
||||||
this.name_qty_M048_1 = name_qty_M048_1;
|
this.name_qty_M048_1 = name_qty_M048_1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getM_id_M065() {
|
||||||
|
return m_id_M065;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setM_id_M065(String m_id_M065) {
|
||||||
|
this.m_id_M065 = m_id_M065;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName_qty_M065() {
|
||||||
|
return name_qty_M065;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName_qty_M065(String name_qty_M065) {
|
||||||
|
this.name_qty_M065 = name_qty_M065;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getM_id_M066() {
|
||||||
|
return m_id_M066;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setM_id_M066(String m_id_M066) {
|
||||||
|
this.m_id_M066 = m_id_M066;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName_qty_M066() {
|
||||||
|
return name_qty_M066;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName_qty_M066(String name_qty_M066) {
|
||||||
|
this.name_qty_M066 = name_qty_M066;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getM_id_M067() {
|
||||||
|
return m_id_M067;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setM_id_M067(String m_id_M067) {
|
||||||
|
this.m_id_M067 = m_id_M067;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName_qty_M067() {
|
||||||
|
return name_qty_M067;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName_qty_M067(String name_qty_M067) {
|
||||||
|
this.name_qty_M067 = name_qty_M067;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getM_id_M068() {
|
||||||
|
return m_id_M068;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setM_id_M068(String m_id_M068) {
|
||||||
|
this.m_id_M068 = m_id_M068;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName_qty_M068() {
|
||||||
|
return name_qty_M068;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName_qty_M068(String name_qty_M068) {
|
||||||
|
this.name_qty_M068 = name_qty_M068;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<collection property="cMaterialTypeList" notNullColumn="sub_type_id" javaType="java.util.List" resultMap="CMaterialTypeResult" />
|
<collection property="cMaterialTypeList" notNullColumn="sub_type_id" javaType="java.util.List" resultMap="CMaterialTypeResult" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap type="CMaterialType" id="CMaterialTypeResult">
|
<resultMap type="CMaterialTypeFactory" id="CMaterialTypeResult">
|
||||||
<result property="typeId" column="sub_type_id" />
|
<result property="typeId" column="sub_type_id" />
|
||||||
<result property="typeNo" column="sub_type_no" />
|
<result property="typeNo" column="sub_type_no" />
|
||||||
<result property="typeName" column="sub_type_name" />
|
<result property="typeName" column="sub_type_name" />
|
||||||
|
@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectCTypelist" resultType="CMaterialType">
|
<select id="selectCTypelist" resultType="CMaterialTypeFactory">
|
||||||
select type_no as typeNo,type_name as typeName from c_material_type
|
select type_no as typeNo,type_name as typeName from c_material_type
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
select a.factory_id, a.factory_no, a.factory_name, a.factory_rg_ratio, a.factory_wj_ratio, a.factory_fl_ratio, a.factory_df_ratio, a.factory_trq_ratio, a.factory_ys_ratio, a.factory_pj_ratio, a.factory_total_ratio,
|
select a.factory_id, a.factory_no, a.factory_name, a.factory_rg_ratio, a.factory_wj_ratio, a.factory_fl_ratio, a.factory_df_ratio, a.factory_trq_ratio, a.factory_ys_ratio, a.factory_pj_ratio, a.factory_total_ratio,
|
||||||
b.type_id as sub_type_id, b.type_no as sub_type_no, b.type_name as sub_type_name, b.factory_id as sub_factory_id
|
b.type_id as sub_type_id, b.type_no as sub_type_no, b.type_name as sub_type_name, b.factory_id as sub_factory_id
|
||||||
from c_factory a
|
from c_factory a
|
||||||
left join c_material_type b on b.factory_id = a.factory_id
|
left join c_material_type_factory b on b.factory_id = a.factory_no
|
||||||
where a.factory_id = #{factoryId}
|
where a.factory_id = #{factoryId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
delete from c_factory where factory_id = #{factoryId}
|
delete from c_factory where factory_id = #{factoryId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteCFactoryByFactoryIds" parameterType="String">
|
<delete id="deleteCFactoryByFactoryIds" parameterType="Long">
|
||||||
delete from c_factory where factory_id in
|
delete from c_factory where factory_id in
|
||||||
<foreach item="factoryId" collection="array" open="(" separator="," close=")">
|
<foreach item="factoryId" collection="array" open="(" separator="," close=")">
|
||||||
#{factoryId}
|
#{factoryId}
|
||||||
|
@ -112,18 +112,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteCMaterialTypeByFactoryIds" parameterType="String">
|
<delete id="deleteCMaterialTypeByFactoryIds" parameterType="String">
|
||||||
delete from c_material_type where factory_id in
|
delete from c_material_type_factory where factory_id in
|
||||||
<foreach item="factoryId" collection="array" open="(" separator="," close=")">
|
<foreach item="factoryId" collection="array" open="(" separator="," close=")">
|
||||||
#{factoryId}
|
#{factoryId}
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteCMaterialTypeByFactoryId" parameterType="Long">
|
<delete id="deleteCMaterialTypeByFactoryId" parameterType="String">
|
||||||
delete from c_material_type where factory_id = #{factoryId}
|
delete from c_material_type_factory where factory_id = #{factoryId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<insert id="batchCMaterialType">
|
<insert id="batchCMaterialType">
|
||||||
insert into c_material_type(type_no, type_name, factory_id) values
|
insert into c_material_type_factory(type_no, type_name, factory_id) values
|
||||||
<foreach item="item" index="index" collection="list" separator=",">
|
<foreach item="item" index="index" collection="list" separator=",">
|
||||||
(#{item.typeNo}, #{item.typeName}, #{item.factoryId})
|
(#{item.typeNo}, #{item.typeName}, #{item.factoryId})
|
||||||
</foreach>
|
</foreach>
|
||||||
|
|
|
@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<sql id="selectCMaterialVo">
|
<sql id="selectCMaterialVo">
|
||||||
select a.material_id,a.material_type_id, a.material_xingh, a.material_guig, a.material_diany, a.material_dw,b.type_name
|
select a.material_id,a.material_type_id, a.material_xingh, a.material_guig, a.material_diany, a.material_dw,b.type_name
|
||||||
from c_material a
|
from c_material a
|
||||||
left join c_material_type b on a.material_type_id = b.type_id
|
left join c_material_type b on a.material_type_id = b.type_no
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectCMaterialList" parameterType="CMaterial" resultMap="CMaterialResult">
|
<select id="selectCMaterialList" parameterType="CMaterial" resultMap="CMaterialResult">
|
||||||
|
|
|
@ -4,15 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.materialType.mapper.CMaterialTypeMapper">
|
<mapper namespace="com.ruoyi.materialType.mapper.CMaterialTypeMapper">
|
||||||
|
|
||||||
<resultMap type="c_mtype" id="CMaterialTypeResult">
|
<resultMap type="CMaterialType" id="CMaterialTypeResult">
|
||||||
<result property="typeId" column="type_id" />
|
<result property="typeId" column="type_id" />
|
||||||
<result property="typeNo" column="type_no" />
|
<result property="typeNo" column="type_no" />
|
||||||
<result property="typeName" column="type_name" />
|
<result property="typeName" column="type_name" />
|
||||||
<result property="factoryId" column="factory_id" />
|
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectCMaterialTypeVo">
|
<sql id="selectCMaterialTypeVo">
|
||||||
select type_id, type_no, type_name, factory_id from c_material_type
|
select type_id, type_no, type_name from c_material_type
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectCMaterialTypeList" parameterType="CMaterialType" resultMap="CMaterialTypeResult">
|
<select id="selectCMaterialTypeList" parameterType="CMaterialType" resultMap="CMaterialTypeResult">
|
||||||
|
@ -34,12 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="typeNo != null and typeNo != ''">type_no,</if>
|
<if test="typeNo != null and typeNo != ''">type_no,</if>
|
||||||
<if test="typeName != null and typeName != ''">type_name,</if>
|
<if test="typeName != null and typeName != ''">type_name,</if>
|
||||||
<if test="factoryId != null">factory_id,</if>
|
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="typeNo != null and typeNo != ''">#{typeNo},</if>
|
<if test="typeNo != null and typeNo != ''">#{typeNo},</if>
|
||||||
<if test="typeName != null and typeName != ''">#{typeName},</if>
|
<if test="typeName != null and typeName != ''">#{typeName},</if>
|
||||||
<if test="factoryId != null">#{factoryId},</if>
|
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
@ -48,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="typeNo != null and typeNo != ''">type_no = #{typeNo},</if>
|
<if test="typeNo != null and typeNo != ''">type_no = #{typeNo},</if>
|
||||||
<if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
|
<if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
|
||||||
<if test="factoryId != null">factory_id = #{factoryId},</if>
|
|
||||||
</trim>
|
</trim>
|
||||||
where type_id = #{typeId}
|
where type_id = #{typeId}
|
||||||
</update>
|
</update>
|
||||||
|
|
|
@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
|
|
||||||
<select id="selectTemp" resultType="com.ruoyi.system.domain.temp">
|
<select id="selectTemp" resultType="com.ruoyi.system.domain.temp">
|
||||||
SELECT [id_0]
|
select b.type_no,[uid_0]
|
||||||
,[model_0]
|
,[model_0]
|
||||||
,[model_1]
|
,[model_1]
|
||||||
,[spec_0]
|
,[spec_0]
|
||||||
|
@ -14,144 +14,154 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
,[voltage_0]
|
,[voltage_0]
|
||||||
,[voltage_1]
|
,[voltage_1]
|
||||||
,[unit_0]
|
,[unit_0]
|
||||||
,[m_id_M001]
|
,RTRIM([m_id_M001]) m_id_M001
|
||||||
,[name_qty_M001]
|
,RTRIM([name_qty_M001]) name_qty_M001
|
||||||
,[m_id_M002]
|
,RTRIM([m_id_M002]) m_id_M002
|
||||||
,[name_qty_M002]
|
,RTRIM([name_qty_M002]) name_qty_M002
|
||||||
,[m_id_M003]
|
,RTRIM([m_id_M003]) m_id_M003
|
||||||
,[name_qty_M003]
|
,RTRIM([name_qty_M003]) name_qty_M003
|
||||||
,[name_qty_M003_1]
|
,RTRIM([name_qty_M003_1]) name_qty_M003_1
|
||||||
,[m_id_M004]
|
,RTRIM([m_id_M004]) m_id_M004
|
||||||
,[name_qty_M004]
|
,RTRIM([name_qty_M004]) name_qty_M004
|
||||||
,[name_qty_M004_1]
|
,RTRIM([name_qty_M004_1]) name_qty_M004_1
|
||||||
,[m_id_M005]
|
,RTRIM([m_id_M005]) m_id_M005
|
||||||
,[name_qty_M005]
|
,RTRIM([name_qty_M005]) name_qty_M005
|
||||||
,[m_id_M006]
|
,RTRIM([name_qty_M005_1]) name_qty_M005_1
|
||||||
,[name_qty_M006]
|
,RTRIM([m_id_M006]) m_id_M006
|
||||||
,[m_id_M007]
|
,RTRIM([name_qty_M006]) name_qty_M006
|
||||||
,[name_qty_M007]
|
,RTRIM([m_id_M007]) m_id_M007
|
||||||
,[m_id_M008]
|
,RTRIM([name_qty_M007]) name_qty_M007
|
||||||
,[name_qty_M008]
|
,RTRIM([m_id_M008]) m_id_M008
|
||||||
,[m_id_M009]
|
,RTRIM([name_qty_M008]) name_qty_M008
|
||||||
,[name_qty_M009]
|
,RTRIM([m_id_M009]) m_id_M009
|
||||||
,[m_id_M010]
|
,RTRIM([name_qty_M009]) name_qty_M009
|
||||||
,[name_qty_M010]
|
,RTRIM([m_id_M010]) m_id_M010
|
||||||
,[name_qty_M010_1]
|
,RTRIM([name_qty_M010]) name_qty_M010
|
||||||
,[m_id_M011]
|
,RTRIM([name_qty_M010_1]) name_qty_M010_1
|
||||||
,[name_qty_M011]
|
,RTRIM([m_id_M011]) m_id_M011
|
||||||
,[m_id_M012]
|
,RTRIM([name_qty_M011]) name_qty_M011
|
||||||
,[name_qty_M012]
|
,RTRIM([m_id_M012]) m_id_M012
|
||||||
,[m_id_M013]
|
,RTRIM([name_qty_M012]) name_qty_M012
|
||||||
,[name_qty_M013]
|
,RTRIM([m_id_M013]) m_id_M013
|
||||||
,[m_id_M014]
|
,RTRIM([name_qty_M013]) name_qty_M013
|
||||||
,[name_qty_M014]
|
,RTRIM([m_id_M014]) m_id_M014
|
||||||
,[m_id_M015]
|
,RTRIM([name_qty_M014]) name_qty_M014
|
||||||
,[name_qty_M015]
|
,RTRIM([m_id_M015]) m_id_M015
|
||||||
,[m_id_M016]
|
,RTRIM([name_qty_M015]) name_qty_M015
|
||||||
,[name_qty_M016]
|
,RTRIM([m_id_M016]) m_id_M016
|
||||||
,[m_id_M017]
|
,RTRIM([name_qty_M016]) name_qty_M016
|
||||||
,[name_qty_M017]
|
,RTRIM([m_id_M017]) m_id_M017
|
||||||
,[m_id_M018]
|
,RTRIM([name_qty_M017]) name_qty_M017
|
||||||
,[name_qty_M018]
|
,RTRIM([m_id_M018]) m_id_M018
|
||||||
,[m_id_M019]
|
,RTRIM([name_qty_M018]) name_qty_M018
|
||||||
,[name_qty_M019]
|
,RTRIM([m_id_M019]) m_id_M019
|
||||||
,[name_qty_M019_1]
|
,RTRIM([name_qty_M019]) name_qty_M019
|
||||||
,[m_id_M020]
|
,RTRIM([name_qty_M019_1]) name_qty_M019_1
|
||||||
,[name_qty_M020]
|
,RTRIM([m_id_M020]) m_id_M020
|
||||||
,[m_id_M021]
|
,RTRIM([name_qty_M020]) name_qty_M020
|
||||||
,[name_qty_M021]
|
,RTRIM([m_id_M021]) m_id_M021
|
||||||
,[name_qty_M021_1]
|
,RTRIM([name_qty_M021]) name_qty_M021
|
||||||
,[m_id_M022]
|
,RTRIM([name_qty_M021_1]) name_qty_M021_1
|
||||||
,[name_qty_M022]
|
,RTRIM([m_id_M022]) m_id_M022
|
||||||
,[m_id_M023]
|
,RTRIM([name_qty_M022]) name_qty_M022
|
||||||
,[name_qty_M023]
|
,RTRIM([m_id_M023]) m_id_M023
|
||||||
,[m_id_M024]
|
,RTRIM([name_qty_M023]) name_qty_M023
|
||||||
,[name_qty_M024]
|
,RTRIM([m_id_M024]) m_id_M024
|
||||||
,[m_id_M025]
|
,RTRIM([name_qty_M024]) name_qty_M024
|
||||||
,[name_qty_M025]
|
,RTRIM([m_id_M025]) m_id_M025
|
||||||
,[m_id_M026]
|
,RTRIM([name_qty_M025]) name_qty_M025
|
||||||
,[name_qty_M026]
|
,RTRIM([m_id_M026]) m_id_M026
|
||||||
,[m_id_M027]
|
,RTRIM([name_qty_M026]) name_qty_M026
|
||||||
,[name_qty_M027]
|
,RTRIM([m_id_M027]) m_id_M027
|
||||||
,[m_id_M028]
|
,RTRIM([name_qty_M027]) name_qty_M027
|
||||||
,[name_qty_M028]
|
,RTRIM([m_id_M028]) m_id_M028
|
||||||
,[m_id_M029]
|
,RTRIM([name_qty_M028]) name_qty_M028
|
||||||
,[name_qty_M029]
|
,RTRIM([m_id_M029]) m_id_M029
|
||||||
,[m_id_M030]
|
,RTRIM([name_qty_M029]) name_qty_M029
|
||||||
,[name_qty_M030]
|
,RTRIM([m_id_M030]) m_id_M030
|
||||||
,[m_id_M031]
|
,RTRIM([name_qty_M030]) name_qty_M030
|
||||||
,[name_qty_M031]
|
,RTRIM([m_id_M031]) m_id_M031
|
||||||
,[m_id_M032]
|
,RTRIM([name_qty_M031]) name_qty_M031
|
||||||
,[name_qty_M032]
|
,RTRIM([m_id_M032]) m_id_M032
|
||||||
,[m_id_M033]
|
,RTRIM([name_qty_M032]) name_qty_M032
|
||||||
,[name_qty_M033]
|
,RTRIM([m_id_M033]) m_id_M033
|
||||||
,[m_id_M034]
|
,RTRIM([name_qty_M033]) name_qty_M033
|
||||||
,[name_qty_M034]
|
,RTRIM([m_id_M034]) m_id_M034
|
||||||
,[m_id_M035]
|
,RTRIM([name_qty_M034]) name_qty_M034
|
||||||
,[name_qty_M035]
|
,RTRIM([m_id_M035]) m_id_M035
|
||||||
,[m_id_M036]
|
,RTRIM([name_qty_M035]) name_qty_M035
|
||||||
,[name_qty_M036]
|
,RTRIM([m_id_M036]) m_id_M036
|
||||||
,[m_id_M037]
|
,RTRIM([name_qty_M036]) name_qty_M036
|
||||||
,[name_qty_M037]
|
,RTRIM([m_id_M037]) m_id_M037
|
||||||
,[name_qty_M037_1]
|
,RTRIM([name_qty_M037]) name_qty_M037
|
||||||
,[m_id_M038]
|
,RTRIM([name_qty_M037_1]) name_qty_M037_1
|
||||||
,[name_qty_M038]
|
,RTRIM([m_id_M038]) m_id_M038
|
||||||
,[m_id_M039]
|
,RTRIM([name_qty_M038]) name_qty_M038
|
||||||
,[name_qty_M039]
|
,RTRIM([m_id_M039]) m_id_M039
|
||||||
,[name_qty_M039_1]
|
,RTRIM([name_qty_M039]) name_qty_M039
|
||||||
,[m_id_M040]
|
,RTRIM([name_qty_M039_1]) name_qty_M039_1
|
||||||
,[name_qty_M040]
|
,RTRIM([m_id_M040]) m_id_M040
|
||||||
,[m_id_M041]
|
,RTRIM([name_qty_M040]) name_qty_M040
|
||||||
,[name_qty_M041]
|
,RTRIM([m_id_M041]) m_id_M041
|
||||||
,[m_id_M042]
|
,RTRIM([name_qty_M041]) name_qty_M041
|
||||||
,[name_qty_M042]
|
,RTRIM([m_id_M042]) m_id_M042
|
||||||
,[name_qty_M042_1]
|
,RTRIM([name_qty_M042]) name_qty_M042
|
||||||
,[m_id_M043]
|
,RTRIM([name_qty_M042_1]) name_qty_M042_1
|
||||||
,[name_qty_M043]
|
,RTRIM([m_id_M043]) m_id_M043
|
||||||
,[m_id_M044]
|
,RTRIM([name_qty_M043]) name_qty_M043
|
||||||
,[name_qty_M044]
|
,RTRIM([m_id_M044]) m_id_M044
|
||||||
,[m_id_M045]
|
,RTRIM([name_qty_M044]) name_qty_M044
|
||||||
,[name_qty_M045]
|
,RTRIM([m_id_M045]) m_id_M045
|
||||||
,[m_id_M046]
|
,RTRIM([name_qty_M045]) name_qty_M045
|
||||||
,[name_qty_M046]
|
,RTRIM([m_id_M046]) m_id_M046
|
||||||
,[m_id_M047]
|
,RTRIM([name_qty_M046]) name_qty_M046
|
||||||
,[name_qty_M047]
|
,RTRIM([m_id_M047]) m_id_M047
|
||||||
,[m_id_M048]
|
,RTRIM([name_qty_M047]) name_qty_M047
|
||||||
,[name_qty_M048]
|
,RTRIM([m_id_M048]) m_id_M048
|
||||||
,[name_qty_M048_1]
|
,RTRIM([name_qty_M048]) name_qty_M048
|
||||||
,[m_id_M049]
|
,RTRIM([name_qty_M048_1]) name_qty_M048_1
|
||||||
,[name_qty_M049]
|
,RTRIM([m_id_M049]) m_id_M049
|
||||||
,[m_id_M050]
|
,RTRIM([name_qty_M049]) name_qty_M049
|
||||||
,[name_qty_M050]
|
,RTRIM([m_id_M050]) m_id_M050
|
||||||
,[m_id_M051]
|
,RTRIM([name_qty_M050]) name_qty_M050
|
||||||
,[name_qty_M051]
|
,RTRIM([m_id_M051]) m_id_M051
|
||||||
,[m_id_M052]
|
,RTRIM([name_qty_M051]) name_qty_M051
|
||||||
,[name_qty_M052]
|
,RTRIM([m_id_M052]) m_id_M052
|
||||||
,[m_id_M053]
|
,RTRIM([name_qty_M052]) name_qty_M052
|
||||||
,[name_qty_M053]
|
,RTRIM([m_id_M053]) m_id_M053
|
||||||
,[m_id_M054]
|
,RTRIM([name_qty_M053]) name_qty_M053
|
||||||
,[name_qty_M054]
|
,RTRIM([m_id_M054]) m_id_M054
|
||||||
,[m_id_M055]
|
,RTRIM([name_qty_M054]) name_qty_M054
|
||||||
,[name_qty_M055]
|
,RTRIM([m_id_M055]) m_id_M055
|
||||||
,[m_id_M056]
|
,RTRIM([name_qty_M055]) name_qty_M055
|
||||||
,[name_qty_M056]
|
,RTRIM([m_id_M056]) m_id_M056
|
||||||
,[m_id_M057]
|
,RTRIM([name_qty_M056]) name_qty_M056
|
||||||
,[name_qty_M057]
|
,RTRIM([m_id_M057]) m_id_M057
|
||||||
,[m_id_M058]
|
,RTRIM([name_qty_M057]) name_qty_M057
|
||||||
,[name_qty_M058]
|
,RTRIM([m_id_M058]) m_id_M058
|
||||||
,[m_id_M059]
|
,RTRIM([name_qty_M058]) name_qty_M058
|
||||||
,[name_qty_M059]
|
,RTRIM([m_id_M059]) m_id_M059
|
||||||
,[m_id_M060]
|
,RTRIM([name_qty_M059]) name_qty_M059
|
||||||
,[name_qty_M060]
|
,RTRIM([m_id_M060]) m_id_M060
|
||||||
,[m_id_M061]
|
,RTRIM([name_qty_M060]) name_qty_M060
|
||||||
,[name_qty_M061]
|
,RTRIM([m_id_M061]) m_id_M061
|
||||||
,[m_id_M062]
|
,RTRIM([name_qty_M061]) name_qty_M061
|
||||||
,[name_qty_M062]
|
,RTRIM([m_id_M062]) m_id_M062
|
||||||
,[m_id_M063]
|
,RTRIM([name_qty_M062]) name_qty_M062
|
||||||
,[name_qty_M063]
|
,RTRIM([m_id_M063]) m_id_M063
|
||||||
,[m_id_M064]
|
,RTRIM([name_qty_M063]) name_qty_M063
|
||||||
,[name_qty_M064]
|
,RTRIM([m_id_M064]) m_id_M064
|
||||||
FROM [dbo].[temp_2]
|
,RTRIM([name_qty_M064]) name_qty_M064
|
||||||
|
,RTRIM([m_id_M065]) m_id_M065
|
||||||
|
,RTRIM([name_qty_M065]) name_qty_M065
|
||||||
|
,RTRIM([m_id_M066]) m_id_M066
|
||||||
|
,RTRIM([name_qty_M066]) name_qty_M066
|
||||||
|
,RTRIM([m_id_M067]) m_id_M067
|
||||||
|
,RTRIM([name_qty_M067]) name_qty_M067
|
||||||
|
,RTRIM([m_id_M068]) m_id_M068
|
||||||
|
,RTRIM([name_qty_M068]) name_qty_M068
|
||||||
|
|
||||||
|
from temp_3 a left join c_material_type b on a.desp_0 = b.type_name
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertMaterialBatch">
|
<insert id="insertMaterialBatch">
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 江南业务系统
|
||||||
|
|
||||||
# 开发环境配置
|
# 开发环境配置
|
||||||
ENV = 'development'
|
ENV = 'development'
|
||||||
|
|
||||||
# 若依管理系统/开发环境
|
# 江南业务系统/开发环境
|
||||||
VUE_APP_BASE_API = '/dev-api'
|
VUE_APP_BASE_API = '/dev-api'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 江南业务系统
|
||||||
|
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 江南业务系统/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/prod-api'
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 江南业务系统
|
||||||
|
|
||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
|
|
||||||
# 测试环境配置
|
# 测试环境配置
|
||||||
ENV = 'staging'
|
ENV = 'staging'
|
||||||
|
|
||||||
# 若依管理系统/测试环境
|
# 江南业务系统/测试环境
|
||||||
VUE_APP_BASE_API = '/stage-api'
|
VUE_APP_BASE_API = '/stage-api'
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"name": "ruoyi",
|
"name": "ruoyi",
|
||||||
"version": "3.8.7",
|
"version": "3.8.7",
|
||||||
"description": "若依管理系统",
|
"description": "江南业务系统",
|
||||||
"author": "若依",
|
"author": "江南集团",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vue-cli-service serve",
|
"dev": "vue-cli-service serve",
|
||||||
|
|
|
@ -9,13 +9,13 @@
|
||||||
<template v-if="device!=='mobile'">
|
<template v-if="device!=='mobile'">
|
||||||
<search id="header-search" class="right-menu-item" />
|
<search id="header-search" class="right-menu-item" />
|
||||||
|
|
||||||
<el-tooltip content="源码地址" effect="dark" placement="bottom">
|
<!--<el-tooltip content="源码地址" effect="dark" placement="bottom">
|
||||||
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
|
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|
||||||
<el-tooltip content="文档地址" effect="dark" placement="bottom">
|
<el-tooltip content="文档地址" effect="dark" placement="bottom">
|
||||||
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
|
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
|
||||||
</el-tooltip>
|
</el-tooltip>-->
|
||||||
|
|
||||||
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
<el-input v-model="form.materialNo" placeholder="请输入编码" :disabled="isDis"/>
|
<el-input v-model="form.materialNo" placeholder="请输入编码" :disabled="isDis"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="名称" prop="materialName">
|
<el-form-item label="名称" prop="materialName">
|
||||||
<el-input v-model="form.materialName" placeholder="请输入名称" :disabled="isDis" />
|
<el-input v-model="form.materialName" placeholder="请输入名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="单价" prop="materialPrice">
|
<el-form-item label="单价" prop="materialPrice">
|
||||||
<el-input v-model="form.materialPrice" placeholder="请输入单价" />
|
<el-input v-model="form.materialPrice" placeholder="请输入单价" />
|
||||||
|
|
|
@ -182,7 +182,7 @@
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialType">删除</el-button>
|
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialType">删除</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table :data="cMaterialTypeList" width="100%" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleCMaterialTypeSelectionChange" ref="cMaterialType">
|
<el-table :data="cmaterialTypeList" width="100%" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleCMaterialTypeSelectionChange" ref="cMaterialType">
|
||||||
<el-table-column type="selection" width="50" align="center" />
|
<el-table-column type="selection" width="50" align="center" />
|
||||||
<el-table-column label="序号" width="50" align="center" prop="index"/>
|
<el-table-column label="序号" width="50" align="center" prop="index"/>
|
||||||
<el-table-column label="编码" prop="typeNo">
|
<el-table-column label="编码" prop="typeNo">
|
||||||
|
@ -243,7 +243,7 @@ export default {
|
||||||
// 车间管理表格数据
|
// 车间管理表格数据
|
||||||
factoryList: [],
|
factoryList: [],
|
||||||
// 物料类别表格数据
|
// 物料类别表格数据
|
||||||
cMaterialTypeList: [],
|
cmaterialTypeList: [],
|
||||||
cTypeList: [],
|
cTypeList: [],
|
||||||
cTypeMap: {},
|
cTypeMap: {},
|
||||||
|
|
||||||
|
@ -364,7 +364,7 @@ export default {
|
||||||
factoryPjRatio: null,
|
factoryPjRatio: null,
|
||||||
factoryTotalRatio: null
|
factoryTotalRatio: null
|
||||||
};
|
};
|
||||||
this.cMaterialTypeList = [];
|
this.cmaterialTypeList = [];
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
|
@ -396,7 +396,7 @@ export default {
|
||||||
const factoryId = row.factoryId || this.ids
|
const factoryId = row.factoryId || this.ids
|
||||||
getFactory(factoryId).then(response => {
|
getFactory(factoryId).then(response => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
this.cMaterialTypeList = response.data.cmaterialTypeList;
|
this.cmaterialTypeList = response.data.cmaterialTypeList;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "修改车间管理";
|
this.title = "修改车间管理";
|
||||||
this.isDis = true;
|
this.isDis = true;
|
||||||
|
@ -406,7 +406,9 @@ export default {
|
||||||
submitForm() {
|
submitForm() {
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.form.cMaterialTypeList = this.cMaterialTypeList;
|
this.form.cmaterialTypeList = this.cmaterialTypeList;
|
||||||
|
|
||||||
|
console.log(this.form)
|
||||||
if (this.form.factoryId != null) {
|
if (this.form.factoryId != null) {
|
||||||
updateFactory(this.form).then(response => {
|
updateFactory(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
|
@ -442,16 +444,17 @@ export default {
|
||||||
let obj = {};
|
let obj = {};
|
||||||
obj.typeNo = "";
|
obj.typeNo = "";
|
||||||
obj.typeName = "";
|
obj.typeName = "";
|
||||||
this.cMaterialTypeList.push(obj);
|
this.cmaterialTypeList.push(obj);
|
||||||
},
|
},
|
||||||
/** 物料类别删除按钮操作 */
|
/** 物料类别删除按钮操作 */
|
||||||
handleDeleteCMaterialType() {
|
handleDeleteCMaterialType() {
|
||||||
if (this.checkedCMaterialType.length == 0) {
|
if (this.checkedCMaterialType.length == 0) {
|
||||||
this.$modal.msgError("请先选择要删除的物料类别数据");
|
this.$modal.msgError("请先选择要删除的物料类别数据");
|
||||||
} else {
|
} else {
|
||||||
const cMaterialTypeList = this.cMaterialTypeList;
|
debugger
|
||||||
|
const cmaterialTypeList = this.cmaterialTypeList;
|
||||||
const checkedCMaterialType = this.checkedCMaterialType;
|
const checkedCMaterialType = this.checkedCMaterialType;
|
||||||
this.cMaterialTypeList = cMaterialTypeList.filter(function(item) {
|
this.cmaterialTypeList = cmaterialTypeList.filter(function(item) {
|
||||||
return checkedCMaterialType.indexOf(item.index) == -1
|
return checkedCMaterialType.indexOf(item.index) == -1
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container home">
|
<div class="app-container home">
|
||||||
<el-row :gutter="20">
|
<!--<el-row :gutter="20">
|
||||||
<el-col :sm="24" :lg="24">
|
<el-col :sm="24" :lg="24">
|
||||||
<blockquote class="text-warning" style="font-size: 14px">
|
<blockquote class="text-warning" style="font-size: 14px">
|
||||||
领取阿里云通用云产品1888优惠券
|
领取阿里云通用云产品1888优惠券
|
||||||
|
@ -979,7 +979,7 @@
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>-->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="login">
|
<div class="login">
|
||||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
||||||
<h3 class="title">若依后台管理系统</h3>
|
<h3 class="title">江南业务管理系统</h3>
|
||||||
<el-form-item prop="username">
|
<el-form-item prop="username">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.username"
|
v-model="loginForm.username"
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 底部 -->
|
<!-- 底部 -->
|
||||||
<div class="el-login-footer">
|
<div class="el-login-footer">
|
||||||
<span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
|
<span>Copyright © 2024 无锡江南电缆有限公司 All rights reserved.</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
v-for="item in cTypeList"
|
v-for="item in cTypeList"
|
||||||
:key="item.typeId"
|
:key="item.typeId"
|
||||||
:label="item.typeName"
|
:label="item.typeName"
|
||||||
:value="item.typeId"
|
:value="item.typeNo"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -167,7 +167,7 @@
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialCost">删除</el-button>
|
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialCost">删除</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table :data="cmaterialCostList" height="350" width="100%" :row-class-name="rowCMaterialCostIndex" @selection-change="handleCMaterialCostSelectionChange" ref="cMaterialCost" :show-summary="showSum" :summary-method="tableHJ">
|
<el-table :data="cMaterialCostList" height="350" width="100%" :row-class-name="rowCMaterialCostIndex" @selection-change="handleCMaterialCostSelectionChange" ref="cMaterialCost" :show-summary="showSum" :summary-method="tableHJ">
|
||||||
<el-table-column type="selection" width="50" align="center" />
|
<el-table-column type="selection" width="50" align="center" />
|
||||||
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
||||||
<el-table-column label="关联用料" width="300" prop="costClId">
|
<el-table-column label="关联用料" width="300" prop="costClId">
|
||||||
|
@ -248,7 +248,7 @@ export default {
|
||||||
// 物料管理表格数据
|
// 物料管理表格数据
|
||||||
materialList: [],
|
materialList: [],
|
||||||
// 物料成本表格数据
|
// 物料成本表格数据
|
||||||
cmaterialCostList: [],
|
cMaterialCostList: [],
|
||||||
//物料类型选项
|
//物料类型选项
|
||||||
cTypeList: [],
|
cTypeList: [],
|
||||||
//材料选项
|
//材料选项
|
||||||
|
@ -280,10 +280,10 @@ export default {
|
||||||
{ required: true, message: "类别不能为空", trigger: "blur" }
|
{ required: true, message: "类别不能为空", trigger: "blur" }
|
||||||
],
|
],
|
||||||
costClQty: [
|
costClQty: [
|
||||||
{ pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,3})?$/, message: '格式有误',trigger: "blur"}
|
{ pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,5})?$/, message: '格式有误',trigger: "blur"}
|
||||||
],
|
],
|
||||||
costClQty2: [
|
costClQty2: [
|
||||||
{ pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,3})?$/, message: '格式有误',trigger: "blur"}
|
{ pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,5})?$/, message: '格式有误',trigger: "blur"}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -350,7 +350,7 @@ export default {
|
||||||
materialDiany: null,
|
materialDiany: null,
|
||||||
materialDw: null
|
materialDw: null
|
||||||
};
|
};
|
||||||
this.cmaterialCostList = [];
|
this.cMaterialCostList = [];
|
||||||
this.resetForm("form");
|
this.resetForm("form");
|
||||||
},
|
},
|
||||||
/** 搜索按钮操作 */
|
/** 搜索按钮操作 */
|
||||||
|
@ -381,7 +381,7 @@ export default {
|
||||||
const materialId = row.materialId || this.ids
|
const materialId = row.materialId || this.ids
|
||||||
getMaterial(materialId).then(response => {
|
getMaterial(materialId).then(response => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
this.cmaterialCostList = response.data.cmaterialCostList;
|
this.cMaterialCostList = response.data.cmaterialCostList;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "修改物料管理";
|
this.title = "修改物料管理";
|
||||||
this.sumPriceTotal()
|
this.sumPriceTotal()
|
||||||
|
@ -391,7 +391,7 @@ export default {
|
||||||
submitForm() {
|
submitForm() {
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.form.cmaterialCostList = this.cMaterialCostList;
|
this.form.cMaterialCostList = this.cMaterialCostList;
|
||||||
if (this.form.materialId != null) {
|
if (this.form.materialId != null) {
|
||||||
updateMaterial(this.form).then(response => {
|
updateMaterial(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
|
@ -429,16 +429,16 @@ export default {
|
||||||
obj.costClQty = "";
|
obj.costClQty = "";
|
||||||
obj.costClQty2 = "";
|
obj.costClQty2 = "";
|
||||||
obj.materialPrice = "";
|
obj.materialPrice = "";
|
||||||
this.cmaterialCostList.push(obj);
|
this.cMaterialCostList.push(obj);
|
||||||
},
|
},
|
||||||
/** 物料成本删除按钮操作 */
|
/** 物料成本删除按钮操作 */
|
||||||
handleDeleteCMaterialCost() {
|
handleDeleteCMaterialCost() {
|
||||||
if (this.checkedCMaterialCost.length == 0) {
|
if (this.checkedCMaterialCost.length == 0) {
|
||||||
this.$modal.msgError("请先选择要删除的物料成本数据");
|
this.$modal.msgError("请先选择要删除的物料成本数据");
|
||||||
} else {
|
} else {
|
||||||
const cmaterialCostList = this.cmaterialCostList;
|
const cMaterialCostList = this.cMaterialCostList;
|
||||||
const checkedCMaterialCost = this.checkedCMaterialCost;
|
const checkedCMaterialCost = this.checkedCMaterialCost;
|
||||||
this.cmaterialCostList = cmaterialCostList.filter(function(item) {
|
this.cMaterialCostList = cMaterialCostList.filter(function(item) {
|
||||||
return checkedCMaterialCost.indexOf(item.index) == -1
|
return checkedCMaterialCost.indexOf(item.index) == -1
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -460,7 +460,7 @@ export default {
|
||||||
|
|
||||||
//页面加载计算每行总价
|
//页面加载计算每行总价
|
||||||
sumPriceTotal(){
|
sumPriceTotal(){
|
||||||
this.cmaterialCostList.forEach((row, index) => {
|
this.cMaterialCostList.forEach((row, index) => {
|
||||||
this.wat(index)
|
this.wat(index)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -468,7 +468,7 @@ export default {
|
||||||
//计算每行总价
|
//计算每行总价
|
||||||
wat(index){
|
wat(index){
|
||||||
this.showSum = false;
|
this.showSum = false;
|
||||||
let tmpObj = this.cmaterialCostList[index];
|
let tmpObj = this.cMaterialCostList[index];
|
||||||
var costClQty = tmpObj.costClQty?tmpObj.costClQty:0;
|
var costClQty = tmpObj.costClQty?tmpObj.costClQty:0;
|
||||||
var costClQty2 = tmpObj.costClQty2?tmpObj.costClQty2:0;
|
var costClQty2 = tmpObj.costClQty2?tmpObj.costClQty2:0;
|
||||||
var qty = numAdd(costClQty,costClQty2);
|
var qty = numAdd(costClQty,costClQty2);
|
||||||
|
|
|
@ -7,7 +7,7 @@ function resolve(dir) {
|
||||||
|
|
||||||
const CompressionPlugin = require('compression-webpack-plugin')
|
const CompressionPlugin = require('compression-webpack-plugin')
|
||||||
|
|
||||||
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
|
const name = process.env.VUE_APP_TITLE || '江南业务系统' // 网页标题
|
||||||
|
|
||||||
const port = process.env.port || process.env.npm_config_port || 3335 // 端口
|
const port = process.env.port || process.env.npm_config_port || 3335 // 端口
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue