diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java new file mode 100644 index 00000000..2937460e --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java @@ -0,0 +1,209 @@ +package jnpf.poundlist.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + + +/** + * + * 磅单档案 + * @版本： V3.2.0 + * @版权： LINKAGE-BOOT + * @作者： LINKAGE-BOOT研发团队 + * @日期： 2023-02-21 + */ +@Data +@TableName("jg_poundlist") +public class PoundlistEntity { + + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("CUSTOMER_ID") + private String customerId; + + @TableField("SALES_ID") + private String salesId; + + @TableField("SUPPLIER_ID") + private String supplierId; + + @TableField("SUPPLIER_NAME") + private String supplierName; + + @TableField("PURCHASE_ID") + private String purchaseId; + + @TableField("MATERIAL_ID") + private String materialId; + + @TableField("ADVANCE") + private String advance; + + @TableField("UNIT") + private String unit; + + @TableField("GROSS_WEIGHT") + private BigDecimal grossWeight; + + @TableField("TARE_WEIGHT") + private BigDecimal tareWeight; + + @TableField("BUCKLE_WEIGHT") + private BigDecimal buckleWeight; + + @TableField("NET_WEIGHT") + private BigDecimal netWeight; + + @TableField("SETTLEMENT") + private BigDecimal settlement; + + @TableField("PURCHASE_PRICE") + private BigDecimal purchasePrice; + + @TableField("SALES_PRICE") + private BigDecimal salesPrice; + + @TableField("INPUT_DATE") + private Date inputDate; + + @TableField("OUTPUT_DATE") + private Date outputDate; + + @TableField("PAY_DATE") + private Date payDate; + + @TableField("PAYMENT_DATE") + private Date paymentDate; + + @TableField("POUND_DATE") + private Date poundDate; + + @TableField("BUSINESS_ID") + private String businessId; + + @TableField("POUND_PICTURES") + private String poundPictures; + + @TableField("VEHICLE_PICTURES") + private String vehiclePictures; + + @TableField("POUND_TYPE") + private String poundType; + + @TableField("POUND_STATUS") + private String poundStatus; + + @TableField("SALES_STATUS") + private String salesStatus; + + @TableField("PURCHASE_STATUS") + private String purchaseStatus; + + @TableField("REMARK") + private String remark; + + @TableField("TRANSPORT_TYPE") + private String transportType; + + @TableField("TRANSPORT_PRICE") + private BigDecimal transportPrice; + + @TableField("ORIGIN_PLACE") + private String originPlace; + + @TableField("NATURAL_ID") + private String naturalId; + + @TableField("POUNDLIST_NO") + private String poundlistNo; + + @TableField("VEHICLE_ID") + private String vehicleId; + + @TableField("IS_EXAMINE") + private String isExamine; + + @TableField("IS_INVOICING") + private String isInvoicing; + + @TableField("IS_PAY") + private String isPay; + + @TableField("IS_COLLECTION") + private String isCollection; + + @TableField("IS_EXPENSE") + private String isExpense; + + @TableField(exist = false) + private String materialName; + + @TableField(exist = false) + private String customerName; + + @TableField(exist = false) + private String salesName; + + @TableField(exist = false) + private String vehicleName; + + @TableField(exist = false) + private String businessName; + + @TableField(exist = false) + private String naturalName; + + @TableField(exist = false) + private String purchaseName; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index 27416b8a..70d78c56 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -107,7 +107,7 @@ public class ReceiptoutController { receiptoutCrForm.setCreatorUserName(userInfo.getUserId()); ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSalesId()); + queryWrapper.lambda().eq(SaleorderitemEntity::getId,entity.getSourceNo()); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); saleorderitemEntity.setStatus("1");//修改销售订单状态 saleorderitemService.updateById(saleorderitemEntity); @@ -147,8 +147,8 @@ public class ReceiptoutController { List list= receiptoutService.getList(receiptoutPagination); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); @@ -228,8 +228,8 @@ public class ReceiptoutController { List list= receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(ReceiptoutEntity entity:list){ - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",entity.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); @@ -259,8 +259,8 @@ public class ReceiptoutController { case "type" : entitys.add(new ExcelExportEntity("业务类型" ,"type")); break; - case "salesId" : - entitys.add(new ExcelExportEntity("来源单号" ,"salesId")); + case "source" : + entitys.add(new ExcelExportEntity("来源单号" ,"source")); break; case "amount" : entitys.add(new ExcelExportEntity("出库金额" ,"amount")); @@ -405,8 +405,8 @@ public class ReceiptoutController { //附表数据转换 //添加到详情表单对象中 - Map salesIdMap = new HashMap<>(); - vo.setSalesId(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSalesId(),salesIdMap)); + Map sourceNoMap = new HashMap<>(); + vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("400235058386036741","id","document_no",vo.getSourceNo(),sourceNoMap)); Map customerIdMap = new HashMap<>(); vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java index 6ec024cd..db9178a2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutCrForm.java @@ -30,8 +30,8 @@ public class ReceiptoutCrForm { private String type; /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java index 1a3f9357..51e74a26 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java @@ -34,8 +34,8 @@ public class ReceiptoutInfoVO{ private String type; /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ @JsonProperty("amount") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java index 61d05ad6..ac4165c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListVO.java @@ -36,8 +36,8 @@ public class ReceiptoutListVO{ /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java index c3bc057e..da7e9838 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutUpForm.java @@ -36,8 +36,8 @@ public class ReceiptoutUpForm{ /** 来源单号 **/ - @JsonProperty("salesId") - private String salesId; + @JsonProperty("sourceNo") + private String sourceNo; /** 出库金额 **/ diff --git a/SC-web/src/layout/components/NavbarRight.vue b/SC-web/src/layout/components/NavbarRight.vue index 8c4bba85..073ecae3 100644 --- a/SC-web/src/layout/components/NavbarRight.vue +++ b/SC-web/src/layout/components/NavbarRight.vue @@ -73,19 +73,19 @@ target="_blank">{{sysConfig.sysName}}

版本：{{sysConfig.sysVersion}}

作者：LINKAGE

-

LINKAGE-BOOT出品

- - -

解放90%重复性的代码编写工作，让你更加专注于业务和体验！

- - -
-
- LINKAGE-BOOT是对外开放性体验产品，平台内所有数据为我司虚构的测试数据，是随机生成非敏感数据，所以严禁任何人在JNPF平台上修改数据内容、扭曲数据目的、传播或售卖测试数据，特此警告。 +

长江云息出品

+ + + + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue index 5b2a28b1..9cefb2d9 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue @@ -20,8 +20,8 @@ -

{{dataForm.salesId}}

+ prop="sourceNo" > +

{{dataForm.sourceNo}}

 @@ -168,6 +168,7 @@ documentNo : '', type : "0", salesId : "XS002", + sourceNo: "", amount : '', currency : "0", num : '', diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue index 0f18aa9b..e07f4d70 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue @@ -27,9 +27,9 @@ - + @@ -245,6 +245,7 @@ documentNo : '', type : "0", salesId : "XS002", + sourceNo: "", amount : '', currency : "0", num : '', @@ -268,7 +269,7 @@ trigger: 'change' }, ], - salesId: [ + sourceNo: [ { required: true, message: '请至少选择一个', diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue index 4d1eacc0..391b956c 100644 --- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue +++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue @@ -155,7 +155,7 @@ - @@ -239,7 +239,7 @@ width="150" > {prop: 'num', label: '出库数量'}, {prop: 'currency', label: '币别'}, {prop: 'issueDate', label: '出库日期'}, - {prop: 'salesId', label: '来源单号'}, + {prop: 'sourceNo', label: '来源单号'}, {prop: 'type', label: '业务类型'}, {prop: 'remark', label: '备注'}, {prop: 'status', label: '单据状态'},