wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改生产加工单计划用量和实际用量取数显示

Browse Source
This commit is contained in:
hy2250089
2020-02-24 14:47:08 +08:00
parent dedc80d719
commit b0685f2565
10 changed files with 2586 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java
View File

@@ -1,7 +1,6 @@
package com.deer.wms.produce.manage;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
@@ -15,6 +14,10 @@ import org.springframework.context.annotation.ComponentScan;
})
public class PmsApplication {
public static void main(String[] args) {
String aa[] = new String[]{"11","22"};
for (int i = 0; i < aa.length; i++) {
System.out.println("=="+aa[i]);
}
SpringApplication.run(PmsApplication.class, args);
}

3
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml
View File

@@ -36,7 +36,8 @@
<result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="specification" jdbcType="VARCHAR" property="specification" />
<result column="dosage" jdbcType="REAL" property="dosage" />
<result column="plan_dosage" jdbcType="REAL" property="planDosage" />
<result column="real_dosage" jdbcType="REAL" property="realDosage" />
<result column="unit_id" jdbcType="INTEGER" property="unitId" />
<result column="memo" jdbcType="VARCHAR" property="memo" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />

2
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
View File

@@ -186,7 +186,7 @@ public class MaterialsInfoController {
}catch (Exception e){
ResultGenerator.genFailResult(CommonCode.SERVER_INERNAL_ERROR,"操作数据库异常","null");
}
PageInfo pageInfo = new PageInfo(list);;
PageInfo pageInfo = new PageInfo(list);
return ResultGenerator.genSuccessResult(pageInfo);
}

10
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java
View File

@@ -127,7 +127,7 @@ public class ProcessBomController {
}
/**
* hy
* hy弃用
* 根据选择的产品名称来展示产品其他数据和工序数据,
* 用于新建生产加工产品bom下拉框选择
* @param params
@@ -166,11 +166,11 @@ public class ProcessBomController {
})
@GetMapping("/and/product/bom/by/prodbom")
public Result ProductAndProcessBomByProdBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
//if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//}
params.setCompanyId(currentUser.getCompanyId());
params.setCompanyId(1);
ProductProcessBomPo productProcessBomPo = processBomService.findProductAndProcessBomByProdBom(params);
return ResultGenerator.genSuccessResult(productProcessBomPo);
}