yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改入库单

Browse Source
product
杨世强 2 years ago
parent d64f49db1d
commit ef673933fa
20 changed files with 783 additions and 478 deletions
Show Stats Download Patch File Download Diff File

209
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
Unescape View File

@ -1,53 +1,66 @@
package jnpf.receiptin.controller; package jnpf.receiptin.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.receiptin.entity.ReceiptinEntity; import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.receiptin.model.receiptin.*; import jnpf.receiptin.model.receiptin.*;
import jnpf.receiptin.service.ReceiptinService; import jnpf.receiptin.model.receiptin.ReceiptinPagination;
import jnpf.receiptin.entity.*;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.util.*; import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum; import jnpf.base.util.*;
import jnpf.util.file.UploadUtil; import jnpf.base.vo.ListVO;
import lombok.Cleanup; import jnpf.util.context.SpringContext;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import lombok.Cleanup;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController;
import jnpf.receiptin.entity.ReceiptinEntity;
import jnpf.receiptin.service.ReceiptinService;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.service.Receiptin_item0Service;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import jnpf.util.GeneraterSwapUtil;
import java.util.List; import java.util.*;
import java.util.Map;
import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum;
/** /**
* *
* 出库单 * receiptin
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Api(tags = "出库单" , value = "出库单") @Api(tags = "receiptin" , value = "receiptin")
@RequestMapping("/api/example/Receiptin") @RequestMapping("/api/receiptin/Receiptin")
public class ReceiptinController { public class ReceiptinController {
@Autowired @Autowired
@ -62,6 +75,8 @@ public class ReceiptinController {
@Autowired @Autowired
private ReceiptinService receiptinService; private ReceiptinService receiptinService;
@Autowired
private Receiptin_item0Service receiptin_item0Service;
@ -76,15 +91,9 @@ public class ReceiptinController {
List<ReceiptinEntity> list= receiptinService.getList(receiptinPagination); List<ReceiptinEntity> list= receiptinService.getList(receiptinPagination);
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ReceiptinEntity entity:list){ for(ReceiptinEntity entity:list){
Map<String,Object> soucenoMap = new HashMap<>();
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
}
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
} }
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class); List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
for(ReceiptinListVO receiptinVO:listVO){ for(ReceiptinListVO receiptinVO:listVO){
@ -110,16 +119,31 @@ public class ReceiptinController {
public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException { public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException {
String mainId =RandomUtil.uuId(); String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
receiptinCrForm.setDocumentno(generaterSwapUtil.getBillNumber("rukudanhao", false));
receiptinCrForm.setCreatorTime(DateUtil.getNow()); receiptinCrForm.setCreatorTime(DateUtil.getNow());
receiptinCrForm.setCreatorUserName(userInfo.getUserId()); receiptinCrForm.setCreatorUserName(userInfo.getUserId());
receiptinCrForm.setCreatorUserId(userInfo.getUserId());
receiptinCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId());
if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){
receiptinCrForm.setDepartmentId(userInfo.getPositionIds()[0]);
}
ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class); ReceiptinEntity entity = JsonUtil.getJsonToBean(receiptinCrForm, ReceiptinEntity.class);
entity.setId(mainId); entity.setId(mainId);
receiptinService.save(entity); receiptinService.save(entity);
List<Receiptin_item0Entity> Receiptin_item0List = JsonUtil.getJsonToList(receiptinCrForm.getReceiptin_item0List(),Receiptin_item0Entity.class);
for(Receiptin_item0Entity entitys : Receiptin_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setReceiptinId(entity.getId());
receiptin_item0Service.save(entitys);
}
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
@ -160,15 +184,9 @@ public class ReceiptinController {
List<ReceiptinEntity> list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType()); List<ReceiptinEntity> list= receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除 //处理id字段转名称，若无需转或者为空可删除
for(ReceiptinEntity entity:list){ for(ReceiptinEntity entity:list){
Map<String,Object> soucenoMap = new HashMap<>();
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",entity.getSouceno(),soucenoMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId()));
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId()));
if (StringUtil.isNotBlank(entity.getOrgnizeId())){
entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "all"));
}
entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId()));
} }
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class); List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
for(ReceiptinListVO receiptinVO:listVO){ for(ReceiptinListVO receiptinVO:listVO){
@ -191,30 +209,30 @@ public class ReceiptinController {
case "documentno" : case "documentno" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentno")); entitys.add(new ExcelExportEntity("单据编号" ,"documentno"));
break; break;
case "suppliername" : case "type" :
entitys.add(new ExcelExportEntity("客户名称" ,"suppliername")); entitys.add(new ExcelExportEntity("业务类型" ,"type"));
break; break;
case "receiptamount" : case "souceno" :
entitys.add(new ExcelExportEntity("出库金额" ,"receiptamount")); entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
break; break;
case "receiptnum" : case "receiptamount" :
entitys.add(new ExcelExportEntity("出库数量" ,"receiptnum")); entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount"));
break; break;
case "currency" : case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency")); entitys.add(new ExcelExportEntity("币别" ,"currency"));
break; break;
case "warehousingdate" : case "receiptnum" :
entitys.add(new ExcelExportEntity("出库日期" ,"warehousingdate")); entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum"));
break;
case "souceno" :
entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
break; break;
case "type" : case "suppliername" :
entitys.add(new ExcelExportEntity("业务类型" ,"type")); entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername"));
break; break;
case "remark" : case "remark" :
entitys.add(new ExcelExportEntity("备注" ,"remark")); entitys.add(new ExcelExportEntity("备注" ,"remark"));
break; break;
case "warehousingdate" :
entitys.add(new ExcelExportEntity("入库日期" ,"warehousingdate"));
break;
case "status" : case "status" :
entitys.add(new ExcelExportEntity("单据状态" ,"status")); entitys.add(new ExcelExportEntity("单据状态" ,"status"));
break; break;
@ -224,24 +242,6 @@ public class ReceiptinController {
case "creatorUserName" : case "creatorUserName" :
entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName")); entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName"));
break; break;
case "creatorUserId" :
entitys.add(new ExcelExportEntity("创建人id" ,"creatorUserId"));
break;
case "lastModifyUserName" :
entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
break;
case "lastModifyUserId" :
entitys.add(new ExcelExportEntity("修改人id" ,"lastModifyUserId"));
break;
case "lastModifyTime" :
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
break;
case "orgnizeId" :
entitys.add(new ExcelExportEntity("组织id" ,"orgnizeId"));
break;
case "departmentId" :
entitys.add(new ExcelExportEntity("部门id" ,"departmentId"));
break;
default: default:
break; break;
} }
@ -309,19 +309,12 @@ public class ReceiptinController {
vo.setCreatorTime(vo.getCreatorTime()); vo.setCreatorTime(vo.getCreatorTime());
} }
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
if(vo.getLastModifyTime()!=null){
vo.setLastModifyTime(vo.getLastModifyTime());
}
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
}
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
//子表 //子表
List<Receiptin_item0Entity> Receiptin_item0List = receiptinService.GetReceiptin_item0List(id);
for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List){
}
vo.setReceiptin_item0List(JsonUtil.getJsonToList(Receiptin_item0List,Receiptin_item0Model.class ));
//副表 //副表
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -338,19 +331,22 @@ public class ReceiptinController {
ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class); ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class);
//子表数据转换 //子表数据转换
List<Receiptin_item0Entity> jg_receiptin_item0List = receiptinService.GetReceiptin_item0List(id);
List<Receiptin_item0Model> jg_receiptin_item0ModelList = JsonUtil.getJsonToList(jg_receiptin_item0List,Receiptin_item0Model.class);
for(Receiptin_item0Model jg_receiptin_item0Model : jg_receiptin_item0ModelList){
Map<String,Object> licensenoMap = new HashMap<>();
jg_receiptin_item0Model.setLicenseno(generaterSwapUtil.getPopupSelectValue("392933121244325765","license_num","license_num",jg_receiptin_item0Model.getLicenseno(),licensenoMap));
Map<String,Object> reservoirareaIdMap = new HashMap<>();
jg_receiptin_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptin_item0Model.getReservoirareaId(),reservoirareaIdMap));
}
vo.setReceiptin_item0List(jg_receiptin_item0ModelList);
//附表数据转换 //附表数据转换
//添加到详情表单对象中 //添加到详情表单对象中
Map<String,Object> soucenoMap = new HashMap<>();
vo.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","document_no","document_no",vo.getSouceno(),soucenoMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
vo.setCreatorUserId(generaterSwapUtil.userSelectValue(vo.getCreatorUserId()));
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
vo.setLastModifyUserId(generaterSwapUtil.userSelectValue(vo.getLastModifyUserId()));
if (StringUtil.isNotBlank(vo.getOrgnizeId())){
vo.setOrgnizeId(generaterSwapUtil.comSelectValue(vo.getOrgnizeId(), "all"));
}
vo.setDepartmentId(generaterSwapUtil.posSelectValue(vo.getDepartmentId()));
return ActionResult.success(vo); return ActionResult.success(vo);
} }
@ -370,16 +366,34 @@ public class ReceiptinController {
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
ReceiptinEntity entity= receiptinService.getInfo(id); ReceiptinEntity entity= receiptinService.getInfo(id);
if(entity!=null){ if(entity!=null){
receiptinUpForm.setLastModifyUserName(userInfo.getUserId());
receiptinUpForm.setLastModifyUserId(userInfo.getUserId());
receiptinUpForm.setLastModifyTime(DateUtil.getNow());
receiptinUpForm.setOrgnizeId(entity.getOrgnizeId());
receiptinUpForm.setDepartmentId(entity.getDepartmentId());
ReceiptinEntity subentity=JsonUtil.getJsonToBean(receiptinUpForm, ReceiptinEntity.class); ReceiptinEntity subentity=JsonUtil.getJsonToBean(receiptinUpForm, ReceiptinEntity.class);
subentity.setCreatorTime(entity.getCreatorTime()); subentity.setCreatorTime(entity.getCreatorTime());
subentity.setCreatorUserName(entity.getCreatorUserName()); subentity.setCreatorUserName(entity.getCreatorUserName());
subentity.setCreatorUserId(entity.getCreatorUserId());
receiptinService.update(id, subentity); receiptinService.update(id, subentity);
QueryWrapper<Receiptin_item0Entity> Receiptin_item0queryWrapper = new QueryWrapper<>();
Receiptin_item0queryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, entity.getId());
receiptin_item0Service.remove(Receiptin_item0queryWrapper);
List<Receiptin_item0Entity> Receiptin_item0List = JsonUtil.getJsonToList(receiptinUpForm.getReceiptin_item0List(),Receiptin_item0Entity.class);
for(Receiptin_item0Entity entitys : Receiptin_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setReceiptinId(entity.getId());
receiptin_item0Service.save(entitys);
}
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ }else{
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
@ -400,6 +414,9 @@ public class ReceiptinController {
ReceiptinEntity entity= receiptinService.getInfo(id); ReceiptinEntity entity= receiptinService.getInfo(id);
if(entity!=null){ if(entity!=null){
receiptinService.delete(entity); receiptinService.delete(entity);
QueryWrapper<Receiptin_item0Entity> queryWrapperReceiptin_item0=new QueryWrapper<>();
queryWrapperReceiptin_item0.lambda().eq(Receiptin_item0Entity::getReceiptinId,entity.getId());
receiptin_item0Service.remove(queryWrapperReceiptin_item0);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");

7
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java
Unescape View File

@ -1,12 +1,15 @@
package jnpf.receiptin.entity; package jnpf.receiptin.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
@ -15,7 +18,7 @@ import java.util.Date;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
@TableName("jg_receiptin") @TableName("jg_receiptin")

17
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java
Unescape View File

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
@TableName("jg_receiptin_item0") @TableName("jg_receiptin_item0")
@ -80,12 +80,6 @@ public class Receiptin_item0Entity {
@TableField("MATERIALNAME") @TableField("MATERIALNAME")
private String materialname; private String materialname;
@TableField("AREACODE")
private String areacode;
@TableField("AREANAME")
private String areaname;
@TableField("UNIT") @TableField("UNIT")
private String unit; private String unit;
@ -110,4 +104,13 @@ public class Receiptin_item0Entity {
@TableField("REMARK") @TableField("REMARK")
private String remark; private String remark;
@TableField("RESERVOIRAREA_ID")
private String reservoirareaId;
@TableField("WAREHOUSE_ID")
private String warehouseId;
@TableField("PURCHASEORDERITEM_ID")
private String purchaseorderitemId;
} }

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
Unescape View File

@ -1,16 +1,16 @@
package jnpf.receiptin.mapper; package jnpf.receiptin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.receiptin.entity.ReceiptinEntity; import jnpf.receiptin.entity.ReceiptinEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* *
* 出库单 * receiptin
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
public interface ReceiptinMapper extends BaseMapper<ReceiptinEntity> { public interface ReceiptinMapper extends BaseMapper<ReceiptinEntity> {

4
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java
Unescape View File

@ -1,8 +1,8 @@
package jnpf.receiptin.mapper; package jnpf.receiptin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.receiptin.entity.Receiptin_item0Entity; import jnpf.receiptin.entity.Receiptin_item0Entity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* *
@ -10,7 +10,7 @@ import jnpf.receiptin.entity.Receiptin_item0Entity;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
public interface Receiptin_item0Mapper extends BaseMapper<Receiptin_item0Entity> { public interface Receiptin_item0Mapper extends BaseMapper<Receiptin_item0Entity> {

66
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java
Unescape View File

@ -2,6 +2,7 @@
package jnpf.receiptin.model.receiptin; package jnpf.receiptin.model.receiptin;
import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinCrForm { public class ReceiptinCrForm {
@ -23,38 +24,38 @@ public class ReceiptinCrForm {
@JsonProperty("documentno") @JsonProperty("documentno")
private String documentno; private String documentno;
/** 客户名称 **/ /** 业务类型 **/
@JsonProperty("suppliername") @JsonProperty("type")
private String suppliername; private String type;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 出库金额 **/ /** 入库金额 **/
@JsonProperty("receiptamount") @JsonProperty("receiptamount")
private String receiptamount; private String receiptamount;
/** 出库数量 **/
@JsonProperty("receiptnum")
private String receiptnum;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
private String currency; private String currency;
/** 出库日期 **/ /** 入库数量 **/
@JsonProperty("warehousingdate") @JsonProperty("receiptnum")
private Long warehousingdate; private String receiptnum;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 业务类型 **/ /** 供应商名称 **/
@JsonProperty("type") @JsonProperty("suppliername")
private String type; private String suppliername;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 入库日期 **/
@JsonProperty("warehousingdate")
private Long warehousingdate;
/** 单据状态 **/ /** 单据状态 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
@ -67,30 +68,9 @@ public class ReceiptinCrForm {
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 创建人id **/ /** 子表数据 **/
@JsonProperty("creatorUserId") @JsonProperty("receiptin_item0List")
private String creatorUserId; private List<Receiptin_item0Model> receiptin_item0List;
/** 修改人名称 **/
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
/** 修改人id **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 组织id **/
@JsonProperty("orgnizeId")
private String orgnizeId;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
} }

67
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java
Unescape View File

@ -3,6 +3,7 @@
package jnpf.receiptin.model.receiptin; package jnpf.receiptin.model.receiptin;
import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List; import java.util.List;
@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinInfoVO{ public class ReceiptinInfoVO{
@ -27,38 +28,38 @@ public class ReceiptinInfoVO{
@JsonProperty("documentno") @JsonProperty("documentno")
private String documentno; private String documentno;
/** 客户名称 **/ /** 业务类型 **/
@JsonProperty("suppliername") @JsonProperty("type")
private String suppliername; private String type;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 出库金额 **/ /** 入库金额 **/
@JsonProperty("receiptamount") @JsonProperty("receiptamount")
private String receiptamount; private String receiptamount;
/** 出库数量 **/
@JsonProperty("receiptnum")
private String receiptnum;
/** 币别 **/ /** 币别 **/
@JsonProperty("currency") @JsonProperty("currency")
private String currency; private String currency;
/** 出库日期 **/ /** 入库数量 **/
@JsonProperty("warehousingdate") @JsonProperty("receiptnum")
private Long warehousingdate; private String receiptnum;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 业务类型 **/ /** 供应商名称 **/
@JsonProperty("type") @JsonProperty("suppliername")
private String type; private String suppliername;
/** 备注 **/ /** 备注 **/
@JsonProperty("remark") @JsonProperty("remark")
private String remark; private String remark;
/** 入库日期 **/
@JsonProperty("warehousingdate")
private Long warehousingdate;
/** 单据状态 **/ /** 单据状态 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
@ -72,29 +73,7 @@ public class ReceiptinInfoVO{
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 创建人id **/ /** 子表数据 **/
@JsonProperty("creatorUserId") @JsonProperty("receiptin_item0List")
private String creatorUserId; private List<Receiptin_item0Model> receiptin_item0List;
/** 修改人名称 **/
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
/** 修改人id **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("lastModifyTime")
private Date lastModifyTime;
/** 组织id **/
@JsonProperty("orgnizeId")
private String orgnizeId;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
} }

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java
Unescape View File

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinListQuery extends Pagination { public class ReceiptinListQuery extends Pagination {
@ -18,8 +18,8 @@ public class ReceiptinListQuery extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentno; private String documentno;
/** 客户名称 */ /** 单据状态 */
private String suppliername; private String status;
/** /**
* 菜单id * 菜单id
*/ */

75
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java
Unescape View File

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinListVO{ public class ReceiptinListVO{
@ -29,19 +29,19 @@ public class ReceiptinListVO{
private String documentno; private String documentno;
/** 客户名称 **/ /** 业务类型 **/
@JsonProperty("suppliername") @JsonProperty("type")
private String suppliername; private String type;
/** 出库金额 **/ /** 来源单号 **/
@JsonProperty("receiptamount") @JsonProperty("souceno")
private String receiptamount; private String souceno;
/** 出库数量 **/ /** 入库金额 **/
@JsonProperty("receiptnum") @JsonProperty("receiptamount")
private String receiptnum; private String receiptamount;
/** 币别 **/ /** 币别 **/
@ -49,20 +49,14 @@ public class ReceiptinListVO{
private String currency; private String currency;
/** 出库日期 **/ /** 入库数量 **/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonProperty("receiptnum")
@JsonProperty("warehousingdate") private String receiptnum;
private Date warehousingdate;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 业务类型 **/ /** 供应商名称 **/
@JsonProperty("type") @JsonProperty("suppliername")
private String type; private String suppliername;
/** 备注 **/ /** 备注 **/
@ -70,6 +64,12 @@ public class ReceiptinListVO{
private String remark; private String remark;
/** 入库日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("warehousingdate")
private Date warehousingdate;
/** 单据状态 **/ /** 单据状态 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
@ -86,35 +86,4 @@ public class ReceiptinListVO{
private String creatorUserName; private String creatorUserName;
/** 创建人id **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 修改人名称 **/
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
/** 修改人id **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("lastModifyTime")
private Date lastModifyTime;
/** 组织id **/
@JsonProperty("orgnizeId")
private String orgnizeId;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
} }

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java
Unescape View File

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinPagination extends Pagination { public class ReceiptinPagination extends Pagination {
@ -19,8 +19,8 @@ public class ReceiptinPagination extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentno; private String documentno;
/** 客户名称 */ /** 单据状态 */
private String suppliername; private String status;
/** /**
* 菜单id * 菜单id
*/ */

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java
Unescape View File

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinPaginationExportModel extends Pagination { public class ReceiptinPaginationExportModel extends Pagination {
@ -24,6 +24,6 @@ public class ReceiptinPaginationExportModel extends Pagination {
/** 单据编号 */ /** 单据编号 */
private String documentno; private String documentno;
/** 客户名称 */ /** 单据状态 */
private String suppliername; private String status;
} }

76
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java
Unescape View File

@ -2,6 +2,7 @@
package jnpf.receiptin.model.receiptin; package jnpf.receiptin.model.receiptin;
import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -15,7 +16,7 @@ import lombok.Data;
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-11 * @日期： 2023-02-08
*/ */
@Data @Data
public class ReceiptinUpForm{ public class ReceiptinUpForm{
@ -28,19 +29,19 @@ public class ReceiptinUpForm{
private String documentno; private String documentno;
/** 客户名称 **/ /** 业务类型 **/
@JsonProperty("suppliername") @JsonProperty("type")
private String suppliername; private String type;
/** 出库金额 **/ /** 来源单号 **/
@JsonProperty("receiptamount") @JsonProperty("souceno")
private String receiptamount; private String souceno;
/** 出库数量 **/ /** 入库金额 **/
@JsonProperty("receiptnum") @JsonProperty("receiptamount")
private String receiptnum; private String receiptamount;
/** 币别 **/ /** 币别 **/
@ -48,19 +49,14 @@ public class ReceiptinUpForm{
private String currency; private String currency;
/** 出库日期 **/ /** 入库数量 **/
@JsonProperty("warehousingdate") @JsonProperty("receiptnum")
private Long warehousingdate; private String receiptnum;
/** 来源单号 **/
@JsonProperty("souceno")
private String souceno;
/** 业务类型 **/ /** 供应商名称 **/
@JsonProperty("type") @JsonProperty("suppliername")
private String type; private String suppliername;
/** 备注 **/ /** 备注 **/
@ -68,6 +64,11 @@ public class ReceiptinUpForm{
private String remark; private String remark;
/** 入库日期 **/
@JsonProperty("warehousingdate")
private Long warehousingdate;
/** 单据状态 **/ /** 单据状态 **/
@JsonProperty("status") @JsonProperty("status")
private String status; private String status;
@ -82,35 +83,8 @@ public class ReceiptinUpForm{
@JsonProperty("creatorUserName") @JsonProperty("creatorUserName")
private String creatorUserName; private String creatorUserName;
/** 子表数据 **/
/** 创建人id **/ @JsonProperty("receiptin_item0List")
@JsonProperty("creatorUserId") private List<Receiptin_item0Model> receiptin_item0List;
private String creatorUserId;
/** 修改人名称 **/
@JsonProperty("lastModifyUserName")
private String lastModifyUserName;
/** 修改人id **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 组织id **/
@JsonProperty("orgnizeId")
private String orgnizeId;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
} }

74
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java
Unescape View File

@ -0,0 +1,74 @@
package jnpf.receiptin.model.receiptin;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
*
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-08
*/
@Data
public class Receiptin_item0Model {
/** 车牌号 **/
@JsonProperty("licenseno")
private String licenseno;
/** 物料名称 **/
@JsonProperty("materialname")
private String materialname;
/** 库区名称 **/
@JsonProperty("reservoirareaId")
private String reservoirareaId;
/** 仓库名称 **/
@JsonProperty("warehouseId")
private String warehouseId;
/** 入库重量 **/
@JsonProperty("num")
private String num;
/** 计量单位 **/
@JsonProperty("unit")
private String unit;
/** 单价 **/
@JsonProperty("price")
private String price;
/** 税率 **/
@JsonProperty("rate")
private String rate;
/** 金额 **/
@JsonProperty("amount")
private String amount;
/** 税额 **/
@JsonProperty("rateamount")
private String rateamount;
/** 批次号 **/
@JsonProperty("batchno")
private String batchno;
// /** 磅单类型 **/
// @JsonProperty("lastModifyUserId")
// private String lastModifyUserId;
/** 磅单类型 **/
@TableField(exist = false)
private String poundType;
}

12
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java
Unescape View File

@ -1,17 +1,18 @@
package jnpf.receiptin.service; package jnpf.receiptin.service;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.service.Receiptin_item0Service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.receiptin.entity.ReceiptinEntity; import jnpf.receiptin.entity.ReceiptinEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.receiptin.model.receiptin.ReceiptinPagination; import jnpf.receiptin.model.receiptin.ReceiptinPagination;
import java.util.*;
import java.util.List;
/** /**
* *
* 出库单 * receiptin
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
public interface ReceiptinService extends IService<ReceiptinEntity> { public interface ReceiptinService extends IService<ReceiptinEntity> {
@ -30,6 +31,7 @@ public interface ReceiptinService extends IService<ReceiptinEntity> {
boolean update( String id, ReceiptinEntity entity); boolean update( String id, ReceiptinEntity entity);
// 子表方法 // 子表方法
List<Receiptin_item0Entity> GetReceiptin_item0List(String id);
//列表子表数据方法 //列表子表数据方法
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java
Unescape View File

@ -1,15 +1,14 @@
package jnpf.receiptin.service; package jnpf.receiptin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.receiptin.entity.Receiptin_item0Entity; import jnpf.receiptin.entity.Receiptin_item0Entity;
import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* *
* jg_receiptin_item0 * jg_receiptin_item0
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
public interface Receiptin_item0Service extends IService<Receiptin_item0Entity> { public interface Receiptin_item0Service extends IService<Receiptin_item0Entity> {

66
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
Unescape View File

@ -1,38 +1,47 @@
package jnpf.receiptin.service.impl; package jnpf.receiptin.service.impl;
import cn.hutool.core.util.ObjectUtil; import jnpf.receiptin.entity.*;
import com.baomidou.mybatisplus.annotation.TableField; import jnpf.receiptin.mapper.ReceiptinMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jnpf.receiptin.service.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.receiptin.entity.ReceiptinEntity;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.mapper.ReceiptinMapper;
import jnpf.receiptin.model.receiptin.ReceiptinPagination; import jnpf.receiptin.model.receiptin.ReceiptinPagination;
import jnpf.receiptin.service.ReceiptinService;
import jnpf.util.ServletUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import jnpf.permission.service.AuthorizeService;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.List; import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
/** /**
* *
* 出库单 * receiptin
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
@Service @Service
public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, ReceiptinEntity> implements ReceiptinService { public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, ReceiptinEntity> implements ReceiptinService{
@Autowired @Autowired
@ -42,6 +51,9 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
private AuthorizeService authorizeService; private AuthorizeService authorizeService;
@Autowired
private Receiptin_item0Service receiptin_item0Service;
@ -102,9 +114,9 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno()); receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno());
} }
if(StringUtil.isNotEmpty(receiptinPagination.getSuppliername())){ if(StringUtil.isNotEmpty(receiptinPagination.getStatus())){
receiptinNum++; receiptinNum++;
receiptinQueryWrapper.lambda().like(ReceiptinEntity::getSuppliername,receiptinPagination.getSuppliername()); receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getStatus,receiptinPagination.getStatus());
} }
if(AllIdList.size()>0){ if(AllIdList.size()>0){
@ -191,9 +203,9 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno()); receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno());
} }
if(StringUtil.isNotEmpty(receiptinPagination.getSuppliername())){ if(StringUtil.isNotEmpty(receiptinPagination.getStatus())){
receiptinNum++; receiptinNum++;
receiptinQueryWrapper.lambda().like(ReceiptinEntity::getSuppliername,receiptinPagination.getSuppliername()); receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getStatus,receiptinPagination.getStatus());
} }
if(AllIdList.size()>0){ if(AllIdList.size()>0){
@ -252,6 +264,12 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
} }
} }
//子表方法 //子表方法
@Override
public List<Receiptin_item0Entity> GetReceiptin_item0List(String id){
QueryWrapper<Receiptin_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Receiptin_item0Entity::getReceiptinId, id);
return receiptin_item0Service.list(queryWrapper);
}
//列表子表数据方法 //列表子表数据方法

30
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java
Unescape View File

@ -1,10 +1,30 @@
package jnpf.receiptin.service.impl; package jnpf.receiptin.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.receiptin.entity.*;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.mapper.Receiptin_item0Mapper; import jnpf.receiptin.mapper.Receiptin_item0Mapper;
import jnpf.receiptin.service.Receiptin_item0Service; import jnpf.receiptin.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
/** /**
* *
@ -12,10 +32,10 @@ import org.springframework.stereotype.Service;
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队 * 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-11 * 日期： 2023-02-08
*/ */
@Service @Service
public class Receiptin_item0ServiceImpl extends ServiceImpl<Receiptin_item0Mapper, Receiptin_item0Entity> implements Receiptin_item0Service { public class Receiptin_item0ServiceImpl extends ServiceImpl<Receiptin_item0Mapper, Receiptin_item0Entity> implements Receiptin_item0Service{
} }

174
SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
Unescape View File

@ -2,70 +2,146 @@
<el-dialog title="详情" <el-dialog title="详情"
:close-on-click-modal="false" append-to-body :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px"> width="1000px">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentno" > prop="documentno" >
<p>{{dataForm.documentno}}</p> <p>{{dataForm.documentno}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="供应商名称" <el-form-item label="业务类型"
prop="suppliername" > prop="type" >
<p>{{dataForm.suppliername}}</p> <p>{{ dataForm.type | dynamicText(typeOptions) }} </p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库金额" <el-form-item label="来源单号"
prop="receiptamount" > prop="souceno" >
<p>{{dataForm.receiptamount}}</p> <p>{{dataForm.souceno}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库数量" <el-form-item label="入库金额"
prop="receiptnum" > prop="receiptamount" >
<p>{{dataForm.receiptnum}}</p> <p>{{dataForm.receiptamount}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="币别" <el-form-item label="币别"
prop="currency" > prop="currency" >
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p> <p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库日期" <el-form-item label="入库数量"
prop="warehousingdate" > prop="receiptnum" >
<p>{{jnpf.dateFormat(dataForm.warehousingdate)}}</p> <p>{{dataForm.receiptnum}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="来源单号"
prop="souceno" >
<p>{{dataForm.souceno}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="业务类型" <el-form-item label="供应商名称"
prop="type" > prop="suppliername" >
<p>{{ dataForm.type | dynamicText(typeOptions) }} </p> <p>{{dataForm.suppliername}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="16" >
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" > prop="remark" >
<p>{{dataForm.remark}}</p> <p>{{dataForm.remark}}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12" >
<el-form-item label="单据状态" <el-form-item label="入库日期"
prop="warehousingdate" >
<p>{{jnpf.dateFormat(dataForm.warehousingdate)}}</p>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="单据状态"
prop="status" > prop="status" >
<p>{{ dataForm.status | dynamicText(statusOptions) }} </p> <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-tabs v-model="activevpzhms" tab-position="top" class="mb-20">
<el-tab-pane label="磅单明细">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptin_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseno" label="车牌号">
<template slot-scope="scope">
<p>{{scope.row.licenseno}}</p>
</template>
</el-table-column>
<el-table-column prop="materialname" label="物料名称">
<template slot-scope="scope">
<p>{{scope.row.materialname}}</p>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称">
<template slot-scope="scope">
<p>{{scope.row.reservoirareaId}}</p>
</template>
</el-table-column>
<el-table-column prop="warehouseId" label="仓库名称">
<template slot-scope="scope">
<p>{{scope.row.warehouseId}}</p>
</template>
</el-table-column>
<el-table-column prop="num" label="入库重量">
<template slot-scope="scope">
<p>{{scope.row.num}}</p>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位">
<template slot-scope="scope">
<p>{{ scope.row.unit | dynamicText(unitOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="price" label="单价">
<template slot-scope="scope">
<p>{{scope.row.price}}</p>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率">
<template slot-scope="scope">
<p>{{ scope.row.rate | dynamicText(rateOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额">
<template slot-scope="scope">
<p>{{scope.row.amount}}</p>
</template>
</el-table-column>
<el-table-column prop="rateamount" label="税额">
<template slot-scope="scope">
<p>{{scope.row.rateamount}}</p>
</template>
</el-table-column>
<el-table-column prop="batchno" label="批次号">
<template slot-scope="scope">
<p>{{scope.row.batchno}}</p>
</template>
</el-table-column>
<el-table-column prop="poundType" label="磅单类型">
<template slot-scope="scope">
<p>{{ scope.row.poundType | dynamicText(poundTypeOptions) }}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tabs>
</el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -90,28 +166,27 @@
dataForm: { dataForm: {
id :'', id :'',
documentno : '', documentno : '',
suppliername : '', type : "",
souceno : "",
receiptamount : '', receiptamount : '',
currency : "0",
receiptnum : '', receiptnum : '',
currency : "", suppliername : '',
warehousingdate : '',
souceno : '',
type : "",
remark : '', remark : '',
status : "", warehousingdate : '',
status : "0",
creatorTime : "", creatorTime : "",
creatorUserName : "", creatorUserName : "",
creatorUserId : "", receiptin_item0List:[],
lastModifyUserName : "",
lastModifyUserId : "",
lastModifyTime : "",
orgnizeId : "",
departmentId : "",
}, },
activevpzhms:'0',
typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购销入库","id":"1"}],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
typeOptions:[{"fullName":"购销入库","id":"0"},{"fullName":"采购入库","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
poundTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
} }
}, },
computed: {}, computed: {},
@ -123,6 +198,9 @@
methods: { methods: {
dataInfo(dataAll){ dataInfo(dataAll){
let _dataAll =dataAll let _dataAll =dataAll
for(let i=0;i<_dataAll.receiptin_item0List.length;i++){
var _list = _dataAll.receiptin_item0List[i];
}
this.dataForm = _dataAll this.dataForm = _dataAll
}, },
@ -133,7 +211,7 @@
if(this.dataForm.id){ if(this.dataForm.id){
this.loading = true this.loading = true
request({ request({
url: '/api/example/Receiptin/detail/'+this.dataForm.id, url: '/api/receiptin/Receiptin/detail/'+this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)

314
SC-web/src/views/scm/basicInformation/receiptin/Form.vue
Unescape View File

@ -2,48 +2,51 @@
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px"> width="1000px">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" > <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="单据编号" <el-form-item label="单据编号"
prop="documentno" > prop="documentno" >
<el-input v-model="dataForm.documentno" <el-input v-model="dataForm.documentno"
placeholder="请输入单据编号" readonly clearable :style='{"width":"100%"}'> placeholder="系统自动生成" readonly >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="供应商名称" <el-form-item label="业务类型"
prop="suppliername" > prop="type" >
<el-input v-model="dataForm.suppliername" <el-select v-model="dataForm.type"
placeholder="请输入供应商名称" clearable :style='{"width":"100%"}'> placeholder="请选择业务类型" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-input> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库金额" <el-form-item label="来源单号"
prop="receiptamount" > prop="souceno" >
<el-input v-model="dataForm.receiptamount" <popupSelect v-model="dataForm.souceno"
placeholder="请输入入库金额" clearable :style='{"width":"100%"}'> placeholder="请选择" clearable field="souceno" interfaceId="392931756640102277" :columnOptions="soucenocolumnOptions" propsValue="document_no" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="popupSelect"
>
</el-input> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库数量" <el-form-item label="入库金额"
prop="receiptnum" > prop="receiptamount" >
<el-input v-model="dataForm.receiptnum" <el-input v-model="dataForm.receiptamount"
placeholder="请输入入库数量" clearable :style='{"width":"100%"}'> placeholder="请输入入库金额" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="币别" <el-form-item label="币别"
prop="currency" > prop="currency" >
<el-select v-model="dataForm.currency" <el-select v-model="dataForm.currency"
placeholder="请选择币别" clearable :style='{"width":"100%"}'> placeholder="请选择币别" clearable :style='{"width":"100%"}'>
@ -52,45 +55,44 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="入库日期" <el-form-item label="入库数量"
prop="warehousingdate" > prop="receiptnum" >
<el-date-picker v-model="dataForm.warehousingdate" <el-input v-model="dataForm.receiptnum"
placeholder="请选择入库日期" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > placeholder="请输入入库数量" clearable :style='{"width":"100%"}'>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="来源单号"
prop="souceno" >
<el-input v-model="dataForm.souceno"
placeholder="请输入来源单号" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="8" >
<el-form-item label="业务类型" <el-form-item label="供应商名称"
prop="type" > prop="suppliername" >
<el-select v-model="dataForm.type" <el-input v-model="dataForm.suppliername"
placeholder="请选择业务类型" clearable :style='{"width":"100%"}'> placeholder="请输入供应商名称" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="16" >
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" > prop="remark" >
<el-input v-model="dataForm.remark" <el-input v-model="dataForm.remark"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' > placeholder="请输入供应商名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12" >
<el-form-item label="单据状态" <el-form-item label="入库日期"
prop="warehousingdate" >
<el-date-picker v-model="dataForm.warehousingdate"
placeholder="请选择入库日期" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="单据状态"
prop="status" > prop="status" >
<el-select v-model="dataForm.status" <el-select v-model="dataForm.status"
placeholder="请选择单据状态" clearable :style='{"width":"100%"}'> placeholder="请选择单据状态" clearable :style='{"width":"100%"}'>
@ -99,6 +101,121 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-tabs v-model="activevpzhms" tab-position="top" class="mb-20">
<el-tab-pane label="磅单明细">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptin_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseno" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseno"
placeholder="请选择" clearable :field="'licenseno'+scope.$index" :bissId="dataForm.souceno" interfaceId="392933121244325765" :columnOptions="receiptin_item0licensenocolumnOptions" propsValue="license_num" relationField="license_num" popupType="dialog"
popupWidth="800px" @change="popupSelect2"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialname" label="物料名称">
<template slot-scope="scope">
<el-input v-model="scope.row.materialname"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称">
<template slot-scope="scope">
<popupSelect v-model="scope.row.reservoirareaId"
placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="392939299932268421" :columnOptions="receiptin_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
popupWidth="800px" @change="popupSelect3"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="warehouseId" label="仓库名称">
<template slot-scope="scope">
<el-input v-model="scope.row.warehouseId"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="num" label="入库重量">
<template slot-scope="scope">
<el-input v-model="scope.row.num"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"200%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="price" label="单价">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"200%"}'>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rateamount" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.rateamount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="batchno" label="批次号">
<template slot-scope="scope">
<el-input v-model="scope.row.batchno"
placeholder="请输入" clearable :style='{"width":"200%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundType" label="磅单类型">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"200%"}'>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptin_item0List(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addreceiptin_item0List()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tabs>
</el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -122,24 +239,20 @@
isDetail: false, isDetail: false,
dataForm: { dataForm: {
documentno : '', documentno : '',
suppliername : '', type : "",
souceno : "",
receiptamount : '', receiptamount : '',
currency : "0",
receiptnum : '', receiptnum : '',
currency : "", suppliername : '',
warehousingdate : '',
souceno : '',
type : "",
remark : '', remark : '',
status : "", warehousingdate : '',
status : "0",
creatorTime : "", creatorTime : "",
creatorUserName : "", creatorUserName : "",
creatorUserId : "", receiptin_item0List:[],
lastModifyUserName : "",
lastModifyUserId : "",
lastModifyTime : "",
orgnizeId : "",
departmentId : "",
}, },
activevpzhms:'0',
rules: rules:
{ {
receiptamount: [ receiptamount: [
@ -147,18 +260,62 @@
receiptnum: [ receiptnum: [
], ],
}, },
typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购销入库","id":"1"}],
soucenocolumnOptions:[ {"label":"采购订单","value":"document_no"}, {"label":"供应商名称","value":"supplier_name"}, {"label":"币别","value":"currency"},],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
typeOptions:[{"fullName":"购销入库","id":"0"},{"fullName":"采购入库","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
receiptin_item0licensenocolumnOptions:[ {"label":"车牌号","value":"license_num"}, {"label":"物料名称","value":"material_name"}, {"label":"库区名称","value":"in_area"}, {"label":"仓库名称","value":"name"}, {"label":"入库数量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"单价","value":"price"}, {"label":"税率","value":"rate"}, {"label":"金额","value":"amount"}, {"label":"批次号","value":"poundlist_id"}, {"label":"磅单类型","value":"pount_type"},],
receiptin_item0reservoirareaIdcolumnOptions:[ {"label":"库区编码","value":"areacode"}, {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"label":"计量单位","value":"unit"}, {"label":"仓库名称","value":"name"},],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
poundTypeOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {
},
created() { created() {
}, },
mounted() {}, mounted() {},
methods: { methods: {
popupSelect(e,d){
this.dataForm.currency = d.currency;
this.dataForm.suppliername = d.supplier_name;
},
popupSelect2(a, b){
for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
if(a == this.dataForm.receiptin_item0List[i].licenseno){
this.dataForm.receiptin_item0List[i].materialname = b.material_name;
this.dataForm.receiptin_item0List[i].reservoirareaId = b.in_area;
this.dataForm.receiptin_item0List[i].warehouseId = b.name;
this.dataForm.receiptin_item0List[i].num = b.settlement;
this.dataForm.receiptin_item0List[i].unit = b.unit;
this.dataForm.receiptin_item0List[i].price = b.price;
this.dataForm.receiptin_item0List[i].rate = b.rate;
this.dataForm.receiptin_item0List[i].amount = b.amount;
this.dataForm.receiptin_item0List[i].batchno = b.poundlist_id;
this.dataForm.receiptin_item0List[i].poundType = b.pound_type;
this.dataForm.receiptin_item0List[i].rateamount = b.amount*b.rate;
this.dataForm.receiptamount = parseFloat(this.dataForm.receiptamount) + parseFloat(b.amount);
this.dataForm.receiptnum = parseFloat(this.dataForm.receiptnum) + parseFloat(b.settlement);
}
}
},
popupSelect3(j,k){
for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
if (j == this.dataForm.receiptin_item0List[i].reservoirareaId){
this.dataForm.receiptin_item0List[i].warehouseId = k.name;
}
}
},
receiptin_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.receiptin_item0List.length;i++){
const e = this.dataForm.receiptin_item0List[i];
}
return isOk;
},
clearData(data){ clearData(data){
for (let key in data) { for (let key in data) {
if (data[key] instanceof Array) { if (data[key] instanceof Array) {
@ -179,7 +336,7 @@
if(this.dataForm.id){ if(this.dataForm.id){
this.loading = true this.loading = true
request({ request({
url: '/api/example/Receiptin/'+this.dataForm.id, url: '/api/receiptin/Receiptin/'+this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -195,6 +352,7 @@
dataFormSubmit() { dataFormSubmit() {
this.$refs['elForm'].validate((valid) => { this.$refs['elForm'].validate((valid) => {
if (valid) { if (valid) {
if (!this.receiptin_item0Exist()) return
this.request() this.request()
} }
}) })
@ -203,7 +361,7 @@
var _data =this.dataList() var _data =this.dataList()
if (!this.dataForm.id) { if (!this.dataForm.id) {
request({ request({
url: '/api/example/Receiptin', url: '/api/receiptin/Receiptin',
method: 'post', method: 'post',
data: _data data: _data
}).then((res) => { }).then((res) => {
@ -219,7 +377,7 @@
}) })
}else{ }else{
request({ request({
url: '/api/example/Receiptin/'+this.dataForm.id, url: '/api/receiptin/Receiptin/'+this.dataForm.id,
method: 'PUT', method: 'PUT',
data: _data data: _data
}).then((res) => { }).then((res) => {
@ -235,12 +393,38 @@
}) })
} }
}, },
addreceiptin_item0List(){
let item = {
licenseno:undefined,
materialname:undefined,
reservoirareaId:undefined,
warehouseId:undefined,
num:undefined,
unit:undefined,
price:undefined,
rate:undefined,
amount:undefined,
rateamount:undefined,
batchno:undefined,
poundType:undefined,
}
this.dataForm.receiptin_item0List.push(item)
},
delreceiptin_item0List(index) {
this.dataForm.receiptin_item0List.splice(index, 1);
},
dataList(){ dataList(){
var _data = JSON.parse(JSON.stringify(this.dataForm)); var _data = JSON.parse(JSON.stringify(this.dataForm));
for(let i=0;i<_data.receiptin_item0List.length;i++){
var _list = _data.receiptin_item0List[i];
}
return _data; return _data;
}, },
dataInfo(dataAll){ dataInfo(dataAll){
let _dataAll =dataAll let _dataAll =dataAll
for(let i=0;i<_dataAll.receiptin_item0List.length;i++){
var _list = _dataAll.receiptin_item0List[i];
}
this.dataForm = _dataAll this.dataForm = _dataAll
}, },
}, },

41
SC-web/src/views/scm/basicInformation/receiptin/index.vue
Unescape View File

@ -10,8 +10,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="供应商名称"> <el-form-item label="单据状态">
<el-input v-model="query.suppliername" placeholder="请输入" clearable> </el-input> <el-select v-model="query.status" placeholder="请选择单据状态"
clearable>
<el-option v-for="(item, index) in statusOptions" :key="index"
:label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -56,6 +61,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehousingdate" label="入库日期" width="0" align="left" <el-table-column prop="warehousingdate" label="入库日期" width="0" align="left"
/>
<el-table-column prop="souceno" label="来源单号" width="0" align="left"
/> />
<el-table-column label="业务类型" width="0" prop="type" algin="left" <el-table-column label="业务类型" width="0" prop="type" algin="left"
> >
@ -63,19 +70,17 @@
{{ scope.row.type | dynamicText(typeOptions) }} {{ scope.row.type | dynamicText(typeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
<el-table-column label="单据状态" width="0" prop="status" algin="left" <el-table-column label="单据状态" width="0" prop="status" algin="left"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }} {{ scope.row.status | dynamicText(statusOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserName" label="创建人" width="0" align="left" <el-table-column prop="creatorTime" label="创建日期" width="0" align="left"
/>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/>
<el-table-column prop="remark" label="备注" width="0" align="left"
/> />
<el-table-column prop="souceno" label="来源单号" width="0" align="left" <el-table-column prop="creatorUserName" label="创建人" width="0" align="left"
/> />
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right"
width="150" > width="150" >
@ -115,7 +120,7 @@ width="150" >
detailVisible: false, detailVisible: false,
query: { query: {
documentno:undefined, documentno:undefined,
suppliername:undefined, status:undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -140,17 +145,17 @@ width="150" >
{prop: 'receiptnum', label: '入库数量'}, {prop: 'receiptnum', label: '入库数量'},
{prop: 'currency', label: '币别'}, {prop: 'currency', label: '币别'},
{prop: 'warehousingdate', label: '入库日期'}, {prop: 'warehousingdate', label: '入库日期'},
{prop: 'souceno', label: '来源单号'},
{prop: 'type', label: '业务类型'}, {prop: 'type', label: '业务类型'},
{prop: 'remark', label: '备注'},
{prop: 'status', label: '单据状态'}, {prop: 'status', label: '单据状态'},
{prop: 'creatorTime', label: '创建日期'},
{prop: 'creatorUserName', label: '创建人'}, {prop: 'creatorUserName', label: '创建人'},
{prop: 'creatorTime', label: '创建时间'},
{prop: 'remark', label: '备注'},
{prop: 'souceno', label: '来源单号'},
], ],
typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购销入库","id":"1"}],
typeProps:{"label":"fullName","value":"id"},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
currencyProps:{"label":"fullName","value":"id"}, currencyProps:{"label":"fullName","value":"id"},
typeOptions:[{"fullName":"购销入库","id":"0"},{"fullName":"采购入库","id":"1"}],
typeProps:{"label":"fullName","value":"id"},
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}], statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
statusProps:{"label":"fullName","value":"id"}, statusProps:{"label":"fullName","value":"id"},
} }
@ -183,7 +188,7 @@ width="150" >
menuId:this.menuId menuId:this.menuId
}; };
request({ request({
url: `/api/example/Receiptin/getList`, url: `/api/receiptin/Receiptin/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
@ -203,7 +208,7 @@ width="150" >
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
request({ request({
url: `/api/example/Receiptin/${id}`, url: `/api/receiptin/Receiptin/${id}`,
method: 'DELETE' method: 'DELETE'
}).then(res => { }).then(res => {
this.$message({ this.$message({
@ -235,7 +240,7 @@ width="150" >
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
request({ request({
url: `/api/example/Receiptin/batchRemove/${ids}`, url: `/api/receiptin/Receiptin/batchRemove/${ids}`,
method: 'DELETE' method: 'DELETE'
}).then(res => { }).then(res => {
this.$message({ this.$message({
@ -264,7 +269,7 @@ width="150" >
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({ request({
url: `/api/example/Receiptin/Actions/Export`, url: `/api/receiptin/Receiptin/Actions/Export`,
method: 'GET', method: 'GET',
data: query data: query
}).then(res => { }).then(res => {

Write Preview
Loading…
Cancel
Save