diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
index efe360a8..81a00832 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
@@ -18,7 +18,7 @@ import jnpf.exception.DataException;
 import org.springframework.transaction.annotation.Transactional;
 import jnpf.base.entity.ProvinceEntity;
 import jnpf.paymentdoc.model.paymentdoc.*;
-import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
+
 import jnpf.paymentdoc.entity.*;
 import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
 import jnpf.util.*;
@@ -91,6 +91,7 @@ public class PaymentdocController {
         List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
         //处理id字段转名称，若无需转或者为空可删除
     for(PaymentdocEntity entity:list){
+
     }
 	List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
     for(PaymentdocListVO paymentdocVO:listVO){
@@ -321,7 +322,9 @@ public class PaymentdocController {
 		List<Paymentdoc_item0Entity> jg_paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id);
 		List<Paymentdoc_item0Model> jg_paymentdoc_item0ModelList = JsonUtil.getJsonToList(jg_paymentdoc_item0List,Paymentdoc_item0Model.class);
 		for(Paymentdoc_item0Model jg_paymentdoc_item0Model : jg_paymentdoc_item0ModelList){
-    }
+            Map<String,Object> orderIdMap = new HashMap<>();
+            jg_paymentdoc_item0Model.setOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157","id","document_no",jg_paymentdoc_item0Model.getOrderId(),orderIdMap));
+        }
 		vo.setPaymentdoc_item0List(jg_paymentdoc_item0ModelList);
 
  //附表数据转换
@@ -347,6 +350,8 @@ public class PaymentdocController {
         PaymentdocEntity entity= paymentdocService.getInfo(id);
         if(entity!=null){
             PaymentdocEntity subentity=JsonUtil.getJsonToBean(paymentdocUpForm, PaymentdocEntity.class);
+            subentity.setCreatorTime(entity.getCreatorTime());
+            subentity.setCreatorUserName(entity.getCreatorUserName());
             paymentdocService.update(id, subentity);
 
             QueryWrapper<Paymentdoc_item0Entity> Paymentdoc_item0queryWrapper = new QueryWrapper<>();
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
index 476fbdb2..54e16bda 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -88,11 +89,11 @@ public class PurchaseorderController {
      * @return
      */
     @PostMapping("pigeonhole")
-    public ActionResult pigeonhole(@PathVariable("id") String id, @RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) {
-        PurchaseorderitemEntity purchaseorder = JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class);
+    public ActionResult pigeonhole(@RequestBody PigeonholeModel pigeonholeModel) {
+        PurchaseorderitemEntity purchaseorder = purchaseorderitemService.getById(pigeonholeModel.getId());
         if (purchaseorder.getInvoiceAmount().equals(purchaseorder.getAmount()) && purchaseorder.getInvoiceAmount().equals(purchaseorder.getPayPrice())){
             purchaseorder.setStatus("3");
-            purchaseorderitemService.update(id,purchaseorder);
+            purchaseorderitemService.updateById(purchaseorder);
             return ActionResult.success("归档成功！");
         }else{
             return ActionResult.fail("发票金额、金额、已付款金额三者不一致！");
@@ -405,7 +406,7 @@ public class PurchaseorderController {
     * @return
     */
     @GetMapping("/detail/{id}")
-    public ActionResult<PurchaseorderInfoVO> detailInfo(@PathVariable("id") String id){
+    public ActionResult<PurchaseorderInfoVO> detailInfo(@PathVariable("id") String id) throws IOException {
         PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
         PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PigeonholeModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PigeonholeModel.java
new file mode 100644
index 00000000..b377dfa5
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PigeonholeModel.java
@@ -0,0 +1,86 @@
+package jnpf.purchaseorder.model.purchaseorder;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class PigeonholeModel {
+    /** id  **/
+    @JsonProperty("id")
+    private String id;
+
+    /** 单据编号 **/
+    @JsonProperty("documentNo")
+    private String documentNo;
+
+    /** 合同编码 **/
+    @JsonProperty("contractCode")
+    private String contractCode;
+
+    /** 合同名称 **/
+    @JsonProperty("contractName")
+    private String contractName;
+
+    /** 供应商名称 **/
+    @JsonProperty("supplierName")
+    private String supplierName;
+
+    /** 币种 **/
+    @JsonProperty("currency")
+    private String currency;
+
+    /** 对方合同号 **/
+    @JsonProperty("contractNo")
+    private String contractNo;
+
+    /** 垫资金额 **/
+    @JsonProperty("advanceAmount")
+    private String advanceAmount;
+
+    /** 重量 **/
+    @JsonProperty("num")
+    private String num;
+
+    /** 金额 **/
+    @JsonProperty("amount")
+    private BigDecimal amount;
+
+    /** 不含税金额 **/
+    @JsonProperty("notAmount")
+    private String notAmount;
+
+    /** 备注信息 **/
+    @JsonProperty("remark")
+    private String remark;
+
+    /** 制单人 **/
+    @JsonProperty("creatorUserName")
+    private String creatorUserName;
+
+    /** 制单时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+    /** ERP订单号 **/
+    @JsonProperty("erpNo")
+    private String erpNo;
+
+    /** 已付款金额 **/
+    @JsonProperty("payPrice")
+    private BigDecimal payPrice;
+
+    /** 发票数量 **/
+    @JsonProperty("invoiceNum")
+    private String invoiceNum;
+
+    /** 发票金额 **/
+    @JsonProperty("invoiceAmount")
+    private BigDecimal invoiceAmount;
+
+    /** 单据状态  **/
+    @JsonProperty("status")
+    private String status;
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
index 000c24bd..e32cfcba 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
@@ -1,53 +1,66 @@
 
 
 package jnpf.receiptin.controller;
-
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 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.enmus.ExcelType;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
-import jnpf.base.UserInfo;
-import jnpf.base.vo.DownloadVO;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
+import jnpf.base.UserInfo;
+import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 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.service.ReceiptinService;
+import jnpf.receiptin.model.receiptin.ReceiptinPagination;
+import jnpf.receiptin.entity.*;
+import jnpf.receiptin.entity.Receiptin_item0Entity;
 import jnpf.util.*;
-import jnpf.util.enums.FileTypeEnum;
-import jnpf.util.file.UploadUtil;
-import lombok.Cleanup;
+import jnpf.base.util.*;
+import jnpf.base.vo.ListVO;
+import jnpf.util.context.SpringContext;
+import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
+import lombok.Cleanup;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import jnpf.util.GeneraterSwapUtil;
+import java.util.*;
+
+import jnpf.util.file.UploadUtil;
+import jnpf.util.enums.FileTypeEnum;
 
 /**
  *
- * 出库单
+ * receiptin
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Slf4j
 @RestController
-@Api(tags = "出库单" , value = "出库单")
-@RequestMapping("/api/example/Receiptin")
+@Api(tags = "receiptin" , value = "receiptin")
+@RequestMapping("/api/receiptin/Receiptin")
 public class ReceiptinController {
 
     @Autowired
@@ -62,6 +75,8 @@ public class ReceiptinController {
     @Autowired
     private ReceiptinService receiptinService;
 
+    @Autowired
+    private Receiptin_item0Service receiptin_item0Service;
 
 
 
@@ -76,15 +91,9 @@ public class ReceiptinController {
         List<ReceiptinEntity> list= receiptinService.getList(receiptinPagination);
         //处理id字段转名称，若无需转或者为空可删除
     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.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);
     for(ReceiptinListVO receiptinVO:listVO){
@@ -110,16 +119,31 @@ public class ReceiptinController {
     public ActionResult create(@RequestBody @Valid ReceiptinCrForm receiptinCrForm) throws DataException {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
+        receiptinCrForm.setDocumentno(generaterSwapUtil.getBillNumber("rukudanhao", false));
         receiptinCrForm.setCreatorTime(DateUtil.getNow());
         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);
 				entity.setId(mainId);
                 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("创建成功");
@@ -160,15 +184,9 @@ public class ReceiptinController {
         List<ReceiptinEntity> list=  receiptinService.getTypeList(receiptinPagination,receiptinPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
     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.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);
     for(ReceiptinListVO receiptinVO:listVO){
@@ -191,30 +209,30 @@ public class ReceiptinController {
                     case "documentno" :
                     entitys.add(new ExcelExportEntity("单据编号" ,"documentno"));
                     break;
-                    case "suppliername" :
-                    entitys.add(new ExcelExportEntity("客户名称" ,"suppliername"));
+                    case "type" :
+                    entitys.add(new ExcelExportEntity("业务类型" ,"type"));
                     break;
-                    case "receiptamount" :
-                    entitys.add(new ExcelExportEntity("出库金额" ,"receiptamount"));
+                    case "souceno" :
+                    entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
                     break;
-                    case "receiptnum" :
-                    entitys.add(new ExcelExportEntity("出库数量" ,"receiptnum"));
+                    case "receiptamount" :
+                    entitys.add(new ExcelExportEntity("入库金额" ,"receiptamount"));
                     break;
                     case "currency" :
                     entitys.add(new ExcelExportEntity("币别" ,"currency"));
                     break;
-                    case "warehousingdate" :
-                    entitys.add(new ExcelExportEntity("出库日期" ,"warehousingdate"));
-                    break;
-                    case "souceno" :
-                    entitys.add(new ExcelExportEntity("来源单号" ,"souceno"));
+                    case "receiptnum" :
+                    entitys.add(new ExcelExportEntity("入库数量" ,"receiptnum"));
                     break;
-                    case "type" :
-                    entitys.add(new ExcelExportEntity("业务类型" ,"type"));
+                    case "suppliername" :
+                    entitys.add(new ExcelExportEntity("供应商名称" ,"suppliername"));
                     break;
                     case "remark" :
                     entitys.add(new ExcelExportEntity("备注" ,"remark"));
                     break;
+                    case "warehousingdate" :
+                    entitys.add(new ExcelExportEntity("入库日期" ,"warehousingdate"));
+                    break;
                     case "status" :
                     entitys.add(new ExcelExportEntity("单据状态" ,"status"));
                     break;
@@ -224,24 +242,6 @@ public class ReceiptinController {
                     case "creatorUserName" :
                     entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName"));
                     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:
                     break;
                     }
@@ -309,19 +309,12 @@ public class ReceiptinController {
             vo.setCreatorTime(vo.getCreatorTime());
         }
          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);
     }
@@ -338,19 +331,22 @@ public class ReceiptinController {
         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.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);
 		}
@@ -370,16 +366,34 @@ public class ReceiptinController {
         UserInfo userInfo=userProvider.get();
         ReceiptinEntity entity= receiptinService.getInfo(id);
         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);
 					subentity.setCreatorTime(entity.getCreatorTime());
 					subentity.setCreatorUserName(entity.getCreatorUserName());
-					subentity.setCreatorUserId(entity.getCreatorUserId());
             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("更新成功");
         }else{
             return ActionResult.fail("更新失败，数据不存在");
@@ -400,6 +414,9 @@ public class ReceiptinController {
         ReceiptinEntity entity= receiptinService.getInfo(id);
         if(entity!=null){
             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("删除成功");
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java
index 71a86fa3..fde013ff 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java
@@ -1,12 +1,15 @@
 package jnpf.receiptin.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.math.BigDecimal;
 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
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 @TableName("jg_receiptin")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java
index 95806c1f..318d58ea 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 @TableName("jg_receiptin_item0")
@@ -80,12 +80,6 @@ public class Receiptin_item0Entity  {
     @TableField("MATERIALNAME")
     private String materialname;
 
-    @TableField("AREACODE")
-    private String areacode;
-
-    @TableField("AREANAME")
-    private String areaname;
-
     @TableField("UNIT")
     private String unit;
 
@@ -110,4 +104,13 @@ public class Receiptin_item0Entity  {
     @TableField("REMARK")
     private String remark;
 
+    @TableField("RESERVOIRAREA_ID")
+    private String reservoirareaId;
+
+    @TableField("WAREHOUSE_ID")
+    private String warehouseId;
+
+    @TableField("PURCHASEORDERITEM_ID")
+    private String purchaseorderitemId;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
index 54b8dc4a..03fe268a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
@@ -1,16 +1,16 @@
 package jnpf.receiptin.mapper;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.receiptin.entity.ReceiptinEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  *
- * 出库单
+ * receiptin
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 public interface ReceiptinMapper extends BaseMapper<ReceiptinEntity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java
index 3bae49a4..f5b6d29b 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/Receiptin_item0Mapper.java
@@ -1,8 +1,8 @@
 package jnpf.receiptin.mapper;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 public interface Receiptin_item0Mapper extends BaseMapper<Receiptin_item0Entity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java
index 104e8a69..090653bb 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinCrForm.java
@@ -2,6 +2,7 @@
 
 package jnpf.receiptin.model.receiptin;
 
+import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -14,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinCrForm  {
@@ -23,38 +24,38 @@ public class ReceiptinCrForm  {
     @JsonProperty("documentno")
     private String documentno;
 
-    /** 客户名称 **/
-    @JsonProperty("suppliername")
-    private String suppliername;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
+
+    /** 来源单号 **/
+    @JsonProperty("souceno")
+    private String souceno;
 
-    /** 出库金额 **/
+    /** 入库金额 **/
     @JsonProperty("receiptamount")
     private String receiptamount;
 
-    /** 出库数量 **/
-    @JsonProperty("receiptnum")
-    private String receiptnum;
-
     /** 币别 **/
     @JsonProperty("currency")
     private String currency;
 
-    /** 出库日期 **/
-    @JsonProperty("warehousingdate")
-    private Long  warehousingdate;
-
-    /** 来源单号 **/
-    @JsonProperty("souceno")
-    private String souceno;
+    /** 入库数量 **/
+    @JsonProperty("receiptnum")
+    private String receiptnum;
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 供应商名称 **/
+    @JsonProperty("suppliername")
+    private String suppliername;
 
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
 
+    /** 入库日期 **/
+    @JsonProperty("warehousingdate")
+    private Long  warehousingdate;
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -67,30 +68,9 @@ public class ReceiptinCrForm  {
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
-    /** 创建人id **/
-    @JsonProperty("creatorUserId")
-    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;
-
+	/** 子表数据 **/
+	@JsonProperty("receiptin_item0List")
+	private List<Receiptin_item0Model> receiptin_item0List;
 
 
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java
index bee70f16..5f5777dd 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java
@@ -3,6 +3,7 @@
 
 package jnpf.receiptin.model.receiptin;
 
+import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
@@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinInfoVO{
@@ -27,38 +28,38 @@ public class ReceiptinInfoVO{
         @JsonProperty("documentno")
         private String documentno;
 
-        /** 客户名称 **/
-        @JsonProperty("suppliername")
-        private String suppliername;
+        /** 业务类型 **/
+        @JsonProperty("type")
+        private String type;
+
+        /** 来源单号 **/
+        @JsonProperty("souceno")
+        private String souceno;
 
-        /** 出库金额 **/
+        /** 入库金额 **/
         @JsonProperty("receiptamount")
         private String receiptamount;
 
-        /** 出库数量 **/
-        @JsonProperty("receiptnum")
-        private String receiptnum;
-
         /** 币别 **/
         @JsonProperty("currency")
         private String currency;
 
-        /** 出库日期 **/
-        @JsonProperty("warehousingdate")
-        private Long  warehousingdate;
-
-        /** 来源单号 **/
-        @JsonProperty("souceno")
-        private String souceno;
+        /** 入库数量 **/
+        @JsonProperty("receiptnum")
+        private String receiptnum;
 
-        /** 业务类型 **/
-        @JsonProperty("type")
-        private String type;
+        /** 供应商名称 **/
+        @JsonProperty("suppliername")
+        private String suppliername;
 
         /** 备注 **/
         @JsonProperty("remark")
         private String remark;
 
+        /** 入库日期 **/
+        @JsonProperty("warehousingdate")
+        private Long  warehousingdate;
+
         /** 单据状态 **/
         @JsonProperty("status")
         private String status;
@@ -72,29 +73,7 @@ public class ReceiptinInfoVO{
         @JsonProperty("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;
-
+        /** 子表数据 **/
+        @JsonProperty("receiptin_item0List")
+        private List<Receiptin_item0Model> receiptin_item0List;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java
index 52f4e933..8698ee4d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListQuery.java
@@ -10,7 +10,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinListQuery extends Pagination {
@@ -18,8 +18,8 @@ public class ReceiptinListQuery extends Pagination {
         /** 单据编号 */
         private String documentno;
 
-        /** 客户名称 */
-        private String suppliername;
+        /** 单据状态 */
+        private String status;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java
index 4a8507e5..dad97627 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinListVO{
@@ -29,19 +29,19 @@ public class ReceiptinListVO{
     private String documentno;
 
 
-    /** 客户名称 **/
-    @JsonProperty("suppliername")
-    private String suppliername;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
 
 
-    /** 出库金额 **/
-    @JsonProperty("receiptamount")
-    private String receiptamount;
+    /** 来源单号 **/
+    @JsonProperty("souceno")
+    private String souceno;
 
 
-    /** 出库数量 **/
-    @JsonProperty("receiptnum")
-    private String receiptnum;
+    /** 入库金额 **/
+    @JsonProperty("receiptamount")
+    private String receiptamount;
 
 
     /** 币别 **/
@@ -49,20 +49,14 @@ public class ReceiptinListVO{
     private String currency;
 
 
-    /** 出库日期 **/
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @JsonProperty("warehousingdate")
-    private Date  warehousingdate;
-
-
-    /** 来源单号 **/
-    @JsonProperty("souceno")
-    private String souceno;
+    /** 入库数量 **/
+    @JsonProperty("receiptnum")
+    private String receiptnum;
 
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 供应商名称 **/
+    @JsonProperty("suppliername")
+    private String suppliername;
 
 
     /** 备注 **/
@@ -70,6 +64,12 @@ public class ReceiptinListVO{
     private String remark;
 
 
+    /** 入库日期 **/
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("warehousingdate")
+    private Date  warehousingdate;
+
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -86,35 +86,4 @@ public class ReceiptinListVO{
     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;
-
-
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java
index 45255513..64b7dd0d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinPagination extends Pagination {
@@ -19,8 +19,8 @@ public class ReceiptinPagination extends Pagination {
         /** 单据编号 */
         private String documentno;
 
-        /** 客户名称 */
-        private String suppliername;
+        /** 单据状态 */
+        private String status;
 	/**
     * 菜单id
     */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java
index eb7e6ed1..2ea80f4e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPaginationExportModel.java
@@ -9,7 +9,7 @@ import java.util.*;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinPaginationExportModel extends Pagination {
@@ -24,6 +24,6 @@ public class ReceiptinPaginationExportModel extends Pagination {
 			/** 单据编号 */
     private String documentno;
 
-			/** 客户名称 */
-    private String suppliername;
+			/** 单据状态 */
+    private String status;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java
index 1543b3ed..5e72b3b9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinUpForm.java
@@ -2,6 +2,7 @@
 
 package jnpf.receiptin.model.receiptin;
 
+import jnpf.receiptin.model.receiptin.Receiptin_item0Model;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -15,7 +16,7 @@ import lombok.Data;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-11
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptinUpForm{
@@ -28,19 +29,19 @@ public class ReceiptinUpForm{
     private String documentno;
 
 
-    /** 客户名称 **/
-    @JsonProperty("suppliername")
-    private String suppliername;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
 
 
-    /** 出库金额 **/
-    @JsonProperty("receiptamount")
-    private String receiptamount;
+    /** 来源单号 **/
+    @JsonProperty("souceno")
+    private String souceno;
 
 
-    /** 出库数量 **/
-    @JsonProperty("receiptnum")
-    private String receiptnum;
+    /** 入库金额 **/
+    @JsonProperty("receiptamount")
+    private String receiptamount;
 
 
     /** 币别 **/
@@ -48,19 +49,14 @@ public class ReceiptinUpForm{
     private String currency;
 
 
-    /** 出库日期 **/
-    @JsonProperty("warehousingdate")
-    private Long  warehousingdate;
-
-
-    /** 来源单号 **/
-    @JsonProperty("souceno")
-    private String souceno;
+    /** 入库数量 **/
+    @JsonProperty("receiptnum")
+    private String receiptnum;
 
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 供应商名称 **/
+    @JsonProperty("suppliername")
+    private String suppliername;
 
 
     /** 备注 **/
@@ -68,6 +64,11 @@ public class ReceiptinUpForm{
     private String remark;
 
 
+    /** 入库日期 **/
+    @JsonProperty("warehousingdate")
+    private Long  warehousingdate;
+
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -82,35 +83,8 @@ public class ReceiptinUpForm{
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
-
-    /** 创建人id **/
-    @JsonProperty("creatorUserId")
-    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;
-
+    /** 子表数据 **/
+    @JsonProperty("receiptin_item0List")
+    private List<Receiptin_item0Model> receiptin_item0List;
 
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java
new file mode 100644
index 00000000..b04477a1
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/Receiptin_item0Model.java
@@ -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;
+
+
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java
index 3a1804d0..0641951c 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/ReceiptinService.java
@@ -1,17 +1,18 @@
 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 com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.receiptin.model.receiptin.ReceiptinPagination;
-
-import java.util.List;
+import java.util.*;
 /**
  *
- * 出库单
+ * receiptin
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 public interface ReceiptinService extends IService<ReceiptinEntity> {
 
@@ -30,6 +31,7 @@ public interface ReceiptinService extends IService<ReceiptinEntity> {
     boolean update( String id, ReceiptinEntity entity);
     
 //  子表方法
+     List<Receiptin_item0Entity> GetReceiptin_item0List(String id);
 
     //列表子表数据方法
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java
index 78414ccf..7fa45ac6 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/Receiptin_item0Service.java
@@ -1,15 +1,14 @@
 package jnpf.receiptin.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.receiptin.entity.Receiptin_item0Entity;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  *
  * jg_receiptin_item0
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 public interface Receiptin_item0Service extends IService<Receiptin_item0Entity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
index 3170146d..7d8e1229 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
@@ -1,38 +1,47 @@
 package jnpf.receiptin.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.receiptin.entity.*;
+import jnpf.receiptin.mapper.ReceiptinMapper;
+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 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.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.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableField;
+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
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 @Service
-public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, ReceiptinEntity> implements ReceiptinService {
+public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, ReceiptinEntity> implements ReceiptinService{
 
 
     @Autowired
@@ -42,6 +51,9 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
     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());
                     }
 
-			if(StringUtil.isNotEmpty(receiptinPagination.getSuppliername())){
+			if(StringUtil.isNotEmpty(receiptinPagination.getStatus())){
             receiptinNum++;
-            receiptinQueryWrapper.lambda().like(ReceiptinEntity::getSuppliername,receiptinPagination.getSuppliername());
+                receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getStatus,receiptinPagination.getStatus());
                     }
 
         if(AllIdList.size()>0){
@@ -191,9 +203,9 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
             receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno());
                     }
 
-			if(StringUtil.isNotEmpty(receiptinPagination.getSuppliername())){
+			if(StringUtil.isNotEmpty(receiptinPagination.getStatus())){
             receiptinNum++;
-            receiptinQueryWrapper.lambda().like(ReceiptinEntity::getSuppliername,receiptinPagination.getSuppliername());
+                receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getStatus,receiptinPagination.getStatus());
                     }
 
 		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);
+				}
 
     //列表子表数据方法
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java
index 497f1428..0de41731 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/Receiptin_item0ServiceImpl.java
@@ -1,10 +1,30 @@
 package jnpf.receiptin.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.receiptin.entity.Receiptin_item0Entity;
+import jnpf.receiptin.entity.*;
 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 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
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-11
+ * 日期： 2023-02-08
  */
 @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{
 
 
 }
\ No newline at end of file
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 09f31696..3d126320 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
@@ -1,40 +1,53 @@
 
 
 package jnpf.receiptout.controller;
-
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 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.enmus.ExcelType;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
-import jnpf.base.UserInfo;
-import jnpf.base.vo.DownloadVO;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
+import jnpf.base.UserInfo;
+import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.exception.DataException;
-import jnpf.receiptout.entity.ReceiptoutEntity;
+import org.springframework.transaction.annotation.Transactional;
+import jnpf.base.entity.ProvinceEntity;
 import jnpf.receiptout.model.receiptout.*;
-import jnpf.receiptout.service.ReceiptoutService;
+import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
+import jnpf.receiptout.entity.*;
+import jnpf.receiptout.entity.Receiptout_item0Entity;
 import jnpf.util.*;
-import jnpf.util.enums.FileTypeEnum;
-import jnpf.util.file.UploadUtil;
-import lombok.Cleanup;
+import jnpf.base.util.*;
+import jnpf.base.vo.ListVO;
+import jnpf.util.context.SpringContext;
+import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
+import lombok.Cleanup;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import jnpf.receiptout.entity.ReceiptoutEntity;
+import jnpf.receiptout.service.ReceiptoutService;
+import jnpf.receiptout.entity.Receiptout_item0Entity;
+import jnpf.receiptout.service.Receiptout_item0Service;
 import org.springframework.web.bind.annotation.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import jnpf.util.GeneraterSwapUtil;
+import java.util.*;
+
+import jnpf.util.file.UploadUtil;
+import jnpf.util.enums.FileTypeEnum;
 
 /**
  *
@@ -42,7 +55,7 @@ import java.util.Map;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Slf4j
 @RestController
@@ -62,6 +75,8 @@ public class ReceiptoutController {
     @Autowired
     private ReceiptoutService receiptoutService;
 
+    @Autowired
+    private Receiptout_item0Service receiptout_item0Service;
 
 
 
@@ -76,15 +91,10 @@ public class ReceiptoutController {
         List<ReceiptoutEntity> list= receiptoutService.getList(receiptoutPagination);
         //处理id字段转名称，若无需转或者为空可删除
     for(ReceiptoutEntity entity:list){
+						Map<String,Object> sourceNoMap = new HashMap<>();
+            entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
             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<ReceiptoutListVO> listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class);
     for(ReceiptoutListVO receiptoutVO:listVO){
@@ -110,16 +120,31 @@ public class ReceiptoutController {
     public ActionResult create(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
+        receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
         receiptoutCrForm.setCreatorTime(DateUtil.getNow());
         receiptoutCrForm.setCreatorUserName(userInfo.getUserId());
-        receiptoutCrForm.setCreatorUserId(userInfo.getUserId());
-        receiptoutCrForm.setOrgnizeId(StringUtil.isEmpty(userInfo.getDepartmentId()) ? userInfo.getOrganizeId() : userInfo.getDepartmentId());
-        if(userInfo.getPositionIds()!=null&&userInfo.getPositionIds().length>0){
-            receiptoutCrForm.setDepartmentId(userInfo.getPositionIds()[0]);
-        }
         ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class);
 				entity.setId(mainId);
                 receiptoutService.save(entity);
+                List<Receiptout_item0Entity> Receiptout_item0List = JsonUtil.getJsonToList(receiptoutCrForm.getReceiptout_item0List(),Receiptout_item0Entity.class);
+                for(Receiptout_item0Entity entitys : Receiptout_item0List){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setReceiptinId(entity.getId());
+
+
+
+
+
+
+
+
+
+
+
+
+                receiptout_item0Service.save(entitys);
+            }
+
 
 
         return ActionResult.success("创建成功");
@@ -160,15 +185,10 @@ public class ReceiptoutController {
         List<ReceiptoutEntity> list=  receiptoutService.getTypeList(receiptoutPagination,receiptoutPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
     for(ReceiptoutEntity entity:list){
+						Map<String,Object> sourceNoMap = new HashMap<>();
+            entity.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",entity.getSourceNo(),sourceNoMap));
             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<ReceiptoutListVO> listVO=JsonUtil.getJsonToList(list,ReceiptoutListVO.class);
     for(ReceiptoutListVO receiptoutVO:listVO){
@@ -191,30 +211,30 @@ public class ReceiptoutController {
                     case "documentNo" :
                     entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
                     break;
-                    case "customerName" :
-                    entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
+                    case "type" :
+                    entitys.add(new ExcelExportEntity("业务类型" ,"type"));
+                    break;
+                    case "sourceNo" :
+                    entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo"));
                     break;
                     case "amount" :
                     entitys.add(new ExcelExportEntity("出库金额" ,"amount"));
                     break;
-                    case "num" :
-                    entitys.add(new ExcelExportEntity("出库数量" ,"num"));
-                    break;
                     case "currency" :
                     entitys.add(new ExcelExportEntity("币别" ,"currency"));
                     break;
-                    case "issueDate" :
-                    entitys.add(new ExcelExportEntity("出库日期" ,"issueDate"));
-                    break;
-                    case "sourceNo" :
-                    entitys.add(new ExcelExportEntity("来源单号" ,"sourceNo"));
+                    case "num" :
+                    entitys.add(new ExcelExportEntity("出库数量" ,"num"));
                     break;
-                    case "type" :
-                    entitys.add(new ExcelExportEntity("业务类型" ,"type"));
+                    case "customerName" :
+                    entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
                     break;
                     case "remark" :
                     entitys.add(new ExcelExportEntity("备注" ,"remark"));
                     break;
+                    case "issueDate" :
+                    entitys.add(new ExcelExportEntity("出库日期" ,"issueDate"));
+                    break;
                     case "status" :
                     entitys.add(new ExcelExportEntity("单据状态" ,"status"));
                     break;
@@ -222,25 +242,13 @@ public class ReceiptoutController {
                     entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
                     break;
                     case "creatorUserName" :
-                    entitys.add(new ExcelExportEntity("创建人" ,"creatorUserName"));
-                    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"));
+                    entitys.add(new ExcelExportEntity("创建人名称" ,"creatorUserName"));
                     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"));
+                    case "lastModifyUserName" :
+                    entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
                     break;
             default:
                     break;
@@ -309,19 +317,16 @@ public class ReceiptoutController {
             vo.setCreatorTime(vo.getCreatorTime());
         }
          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()));
+         vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
 
     //子表
+		List<Receiptout_item0Entity> Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
+		for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){
+		}
+		vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class ));
     //副表
         return ActionResult.success(vo);
     }
@@ -338,19 +343,23 @@ public class ReceiptoutController {
         ReceiptoutInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptoutInfoVO.class);
 
  //子表数据转换
+		List<Receiptout_item0Entity> jg_receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
+		List<Receiptout_item0Model> jg_receiptout_item0ModelList = JsonUtil.getJsonToList(jg_receiptout_item0List,Receiptout_item0Model.class);
+		for(Receiptout_item0Model jg_receiptout_item0Model : jg_receiptout_item0ModelList){
+								Map<String,Object> licenseNoMap = new HashMap<>();
+                jg_receiptout_item0Model.setLicenseNo(generaterSwapUtil.getPopupSelectValue("392933248017164229","license_no","license_no",jg_receiptout_item0Model.getLicenseNo(),licenseNoMap));
+								Map<String,Object> reservoirareaIdMap = new HashMap<>();
+                jg_receiptout_item0Model.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptout_item0Model.getReservoirareaId(),reservoirareaIdMap));
+    }
+		vo.setReceiptout_item0List(jg_receiptout_item0ModelList);
 
  //附表数据转换
 
 //添加到详情表单对象中
+						Map<String,Object> sourceNoMap = new HashMap<>();
+            vo.setSourceNo(generaterSwapUtil.getPopupSelectValue("392956668264114117","document_no","document_no",vo.getSourceNo(),sourceNoMap));
             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);
 		}
@@ -370,16 +379,36 @@ public class ReceiptoutController {
         UserInfo userInfo=userProvider.get();
         ReceiptoutEntity entity= receiptoutService.getInfo(id);
         if(entity!=null){
-                receiptoutUpForm.setLastModifyUserName(userInfo.getUserId());
-                receiptoutUpForm.setLastModifyUserId(userInfo.getUserId());
                 receiptoutUpForm.setLastModifyTime(DateUtil.getNow());
-                receiptoutUpForm.setOrgnizeId(entity.getOrgnizeId());
-                receiptoutUpForm.setDepartmentId(entity.getDepartmentId());
+                receiptoutUpForm.setLastModifyUserName(userInfo.getUserId());
             ReceiptoutEntity subentity=JsonUtil.getJsonToBean(receiptoutUpForm, ReceiptoutEntity.class);
 					subentity.setCreatorTime(entity.getCreatorTime());
 					subentity.setCreatorUserName(entity.getCreatorUserName());
-					subentity.setCreatorUserId(entity.getCreatorUserId());
             receiptoutService.update(id, subentity);
+
+            QueryWrapper<Receiptout_item0Entity> Receiptout_item0queryWrapper = new QueryWrapper<>();
+            Receiptout_item0queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, entity.getId());
+            receiptout_item0Service.remove(Receiptout_item0queryWrapper);
+
+            List<Receiptout_item0Entity> Receiptout_item0List = JsonUtil.getJsonToList(receiptoutUpForm.getReceiptout_item0List(),Receiptout_item0Entity.class);
+            for(Receiptout_item0Entity entitys : Receiptout_item0List){
+
+
+
+
+
+
+
+
+
+
+
+
+                entitys.setId(RandomUtil.uuId());
+                entitys.setReceiptinId(entity.getId());
+                receiptout_item0Service.save(entitys);
+            }
+
         return ActionResult.success("更新成功");
         }else{
             return ActionResult.fail("更新失败，数据不存在");
@@ -400,6 +429,9 @@ public class ReceiptoutController {
         ReceiptoutEntity entity= receiptoutService.getInfo(id);
         if(entity!=null){
             receiptoutService.delete(entity);
+            QueryWrapper<Receiptout_item0Entity> queryWrapperReceiptout_item0=new QueryWrapper<>();
+            queryWrapperReceiptout_item0.lambda().eq(Receiptout_item0Entity::getReceiptinId,entity.getId());
+            receiptout_item0Service.remove(queryWrapperReceiptout_item0);
 
         }
         return ActionResult.success("删除成功");
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
index d58188ae..da03c904 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java
@@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 @TableName("jg_receiptout")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
index be3531fe..a47f25b7 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 @TableName("jg_receiptout_item0")
@@ -80,11 +80,11 @@ public class Receiptout_item0Entity  {
     @TableField("MATERIAL_NAME")
     private String materialName;
 
-    @TableField("AREA_CODE")
-    private String areaCode;
+    @TableField("WAREHOUSE_ID")
+    private String warehouseId;
 
-    @TableField("AREA_NAME")
-    private String areaName;
+    @TableField("RESERVOIRAREA_ID")
+    private String reservoirareaId;
 
     @TableField("UNIT")
     private String unit;
@@ -110,4 +110,7 @@ public class Receiptout_item0Entity  {
     @TableField("REMARK")
     private String remark;
 
+    @TableField("SALESORDERITEM_ID")
+    private String salesorderitemId;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
index cb1424e9..a6b3423a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java
@@ -1,8 +1,8 @@
 package jnpf.receiptout.mapper;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.receiptout.entity.ReceiptoutEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  *
@@ -10,7 +10,7 @@ import jnpf.receiptout.entity.ReceiptoutEntity;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java
index d0f16de1..38720ef1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/Receiptout_item0Mapper.java
@@ -1,8 +1,8 @@
 package jnpf.receiptout.mapper;
 
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  *
@@ -10,7 +10,7 @@ import jnpf.receiptout.entity.Receiptout_item0Entity;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 public interface Receiptout_item0Mapper extends BaseMapper<Receiptout_item0Entity> {
 
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 1b576ead..10bf0986 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
@@ -2,6 +2,7 @@
 
 package jnpf.receiptout.model.receiptout;
 
+import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -14,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutCrForm  {
@@ -23,38 +24,38 @@ public class ReceiptoutCrForm  {
     @JsonProperty("documentNo")
     private String documentNo;
 
-    /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
+
+    /** 来源单号 **/
+    @JsonProperty("sourceNo")
+    private String sourceNo;
 
     /** 出库金额 **/
     @JsonProperty("amount")
     private String amount;
 
-    /** 出库数量 **/
-    @JsonProperty("num")
-    private String num;
-
     /** 币别 **/
     @JsonProperty("currency")
     private String currency;
 
-    /** 出库日期 **/
-    @JsonProperty("issueDate")
-    private Long  issueDate;
-
-    /** 来源单号 **/
-    @JsonProperty("sourceNo")
-    private String sourceNo;
+    /** 出库数量 **/
+    @JsonProperty("num")
+    private String num;
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 客户名称 **/
+    @JsonProperty("customerName")
+    private String customerName;
 
     /** 备注 **/
     @JsonProperty("remark")
     private String remark;
 
+    /** 出库日期 **/
+    @JsonProperty("issueDate")
+    private Long  issueDate;
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -63,34 +64,21 @@ public class ReceiptoutCrForm  {
     @JsonProperty("creatorTime")
     private String creatorTime;
 
-    /** 创建人 **/
+    /** 创建人名称 **/
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
-    /** 创建人id **/
-    @JsonProperty("creatorUserId")
-    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;
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
 
+	/** 子表数据 **/
+	@JsonProperty("receiptout_item0List")
+	private List<Receiptout_item0Model> receiptout_item0List;
 
 
 }
\ No newline at end of file
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 851f9d83..abacb887 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
@@ -3,6 +3,7 @@
 
 package jnpf.receiptout.model.receiptout;
 
+import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
@@ -15,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutInfoVO{
@@ -27,38 +28,38 @@ public class ReceiptoutInfoVO{
         @JsonProperty("documentNo")
         private String documentNo;
 
-        /** 客户名称 **/
-        @JsonProperty("customerName")
-        private String customerName;
+        /** 业务类型 **/
+        @JsonProperty("type")
+        private String type;
+
+        /** 来源单号 **/
+        @JsonProperty("sourceNo")
+        private String sourceNo;
 
         /** 出库金额 **/
         @JsonProperty("amount")
         private String amount;
 
-        /** 出库数量 **/
-        @JsonProperty("num")
-        private String num;
-
         /** 币别 **/
         @JsonProperty("currency")
         private String currency;
 
-        /** 出库日期 **/
-        @JsonProperty("issueDate")
-        private Long  issueDate;
-
-        /** 来源单号 **/
-        @JsonProperty("sourceNo")
-        private String sourceNo;
+        /** 出库数量 **/
+        @JsonProperty("num")
+        private String num;
 
-        /** 业务类型 **/
-        @JsonProperty("type")
-        private String type;
+        /** 客户名称 **/
+        @JsonProperty("customerName")
+        private String customerName;
 
         /** 备注 **/
         @JsonProperty("remark")
         private String remark;
 
+        /** 出库日期 **/
+        @JsonProperty("issueDate")
+        private Long  issueDate;
+
         /** 单据状态 **/
         @JsonProperty("status")
         private String status;
@@ -68,33 +69,20 @@ public class ReceiptoutInfoVO{
         @JsonProperty("creatorTime")
         private Date  creatorTime;
 
-        /** 创建人 **/
+        /** 创建人名称 **/
         @JsonProperty("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;
+        /** 修改人名称 **/
+        @JsonProperty("lastModifyUserName")
+        private String lastModifyUserName;
 
+        /** 子表数据 **/
+        @JsonProperty("receiptout_item0List")
+        private List<Receiptout_item0Model> receiptout_item0List;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java
index 365a13df..a9059788 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutListQuery.java
@@ -10,7 +10,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutListQuery extends Pagination {
@@ -18,6 +18,9 @@ public class ReceiptoutListQuery extends Pagination {
         /** 单据编号 */
         private String documentNo;
 
+        /** 业务类型 */
+        private String type;
+
         /** 客户名称 */
         private String customerName;
 	/**
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 905cc4aa..9e1a6ce9 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
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutListVO{
@@ -29,9 +29,14 @@ public class ReceiptoutListVO{
     private String documentNo;
 
 
-    /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
+
+
+    /** 来源单号 **/
+    @JsonProperty("sourceNo")
+    private String sourceNo;
 
 
     /** 出库金额 **/
@@ -39,30 +44,19 @@ public class ReceiptoutListVO{
     private String amount;
 
 
-    /** 出库数量 **/
-    @JsonProperty("num")
-    private String num;
-
-
     /** 币别 **/
     @JsonProperty("currency")
     private String currency;
 
 
-    /** 出库日期 **/
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @JsonProperty("issueDate")
-    private Date  issueDate;
-
-
-    /** 来源单号 **/
-    @JsonProperty("sourceNo")
-    private String sourceNo;
+    /** 出库数量 **/
+    @JsonProperty("num")
+    private String num;
 
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 客户名称 **/
+    @JsonProperty("customerName")
+    private String customerName;
 
 
     /** 备注 **/
@@ -70,6 +64,12 @@ public class ReceiptoutListVO{
     private String remark;
 
 
+    /** 出库日期 **/
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("issueDate")
+    private Date  issueDate;
+
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -81,40 +81,20 @@ public class ReceiptoutListVO{
     private Date  creatorTime;
 
 
-    /** 创建人 **/
+    /** 创建人名称 **/
     @JsonProperty("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;
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
 
 
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
index 80a875a0..6659852d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutPagination extends Pagination {
@@ -19,6 +19,9 @@ public class ReceiptoutPagination extends Pagination {
         /** 单据编号 */
         private String documentNo;
 
+        /** 业务类型 */
+        private String type;
+
         /** 客户名称 */
         private String customerName;
 	/**
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java
index cb3d7e73..0e349632 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPaginationExportModel.java
@@ -9,7 +9,7 @@ import java.util.*;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutPaginationExportModel extends Pagination {
@@ -24,6 +24,9 @@ public class ReceiptoutPaginationExportModel extends Pagination {
 			/** 单据编号 */
     private String documentNo;
 
+			/** 业务类型 */
+    private String type;
+
 			/** 客户名称 */
     private String customerName;
 }
\ No newline at end of file
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 5c1def00..700f4bb9 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
@@ -2,6 +2,7 @@
 
 package jnpf.receiptout.model.receiptout;
 
+import jnpf.receiptout.model.receiptout.Receiptout_item0Model;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -15,7 +16,7 @@ import lombok.Data;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-12
+ * @日期： 2023-02-08
  */
 @Data
 public class ReceiptoutUpForm{
@@ -28,9 +29,14 @@ public class ReceiptoutUpForm{
     private String documentNo;
 
 
-    /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
+    /** 业务类型 **/
+    @JsonProperty("type")
+    private String type;
+
+
+    /** 来源单号 **/
+    @JsonProperty("sourceNo")
+    private String sourceNo;
 
 
     /** 出库金额 **/
@@ -38,29 +44,19 @@ public class ReceiptoutUpForm{
     private String amount;
 
 
-    /** 出库数量 **/
-    @JsonProperty("num")
-    private String num;
-
-
     /** 币别 **/
     @JsonProperty("currency")
     private String currency;
 
 
-    /** 出库日期 **/
-    @JsonProperty("issueDate")
-    private Long  issueDate;
-
-
-    /** 来源单号 **/
-    @JsonProperty("sourceNo")
-    private String sourceNo;
+    /** 出库数量 **/
+    @JsonProperty("num")
+    private String num;
 
 
-    /** 业务类型 **/
-    @JsonProperty("type")
-    private String type;
+    /** 客户名称 **/
+    @JsonProperty("customerName")
+    private String customerName;
 
 
     /** 备注 **/
@@ -68,6 +64,11 @@ public class ReceiptoutUpForm{
     private String remark;
 
 
+    /** 出库日期 **/
+    @JsonProperty("issueDate")
+    private Long  issueDate;
+
+
     /** 单据状态 **/
     @JsonProperty("status")
     private String status;
@@ -78,39 +79,22 @@ public class ReceiptoutUpForm{
     private String creatorTime;
 
 
-    /** 创建人 **/
+    /** 创建人名称 **/
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
 
-    /** 创建人id **/
-    @JsonProperty("creatorUserId")
-    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;
+    /** 修改人名称 **/
+    @JsonProperty("lastModifyUserName")
+    private String lastModifyUserName;
 
+    /** 子表数据 **/
+    @JsonProperty("receiptout_item0List")
+    private List<Receiptout_item0Model> receiptout_item0List;
 
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
new file mode 100644
index 00000000..ca2adcda
--- /dev/null
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java
@@ -0,0 +1,70 @@
+package jnpf.receiptout.model.receiptout;
+
+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 Receiptout_item0Model  {
+
+    /** 车牌号 **/
+    @JsonProperty("licenseNo")
+    private String licenseNo;
+
+    /** 物料名称 **/
+    @JsonProperty("materialName")
+    private String materialName;
+
+    /** 库区id **/
+    @JsonProperty("reservoirareaId")
+    private String reservoirareaId;
+
+    /** 仓库id **/
+    @JsonProperty("warehouseId")
+    private String warehouseId;
+
+    /** 出库数量 **/
+    @JsonProperty("deliveryNum")
+    private String deliveryNum;
+
+    /** 计量单位 **/
+    @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("deleteUserId")
+    private String deleteUserId;
+
+
+}
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java
index 9d0cf4bb..a5f3c511 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/ReceiptoutService.java
@@ -1,17 +1,18 @@
 package jnpf.receiptout.service;
+import jnpf.receiptout.entity.Receiptout_item0Entity;
+import jnpf.receiptout.service.Receiptout_item0Service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.receiptout.entity.ReceiptoutEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
-
-import java.util.List;
+import java.util.*;
 /**
  *
  * receiptout
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 public interface ReceiptoutService extends IService<ReceiptoutEntity> {
 
@@ -30,6 +31,7 @@ public interface ReceiptoutService extends IService<ReceiptoutEntity> {
     boolean update( String id, ReceiptoutEntity entity);
     
 //  子表方法
+     List<Receiptout_item0Entity> GetReceiptout_item0List(String id);
 
     //列表子表数据方法
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java
index 12580a38..1b5afc15 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/Receiptout_item0Service.java
@@ -1,16 +1,14 @@
 package jnpf.receiptout.service;
 
-
-import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 /**
  *
  * jg_receiptout_item0
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 public interface Receiptout_item0Service extends IService<Receiptout_item0Entity> {
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
index 090514a0..4f0f11ca 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
@@ -1,27 +1,36 @@
 package jnpf.receiptout.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.receiptout.entity.*;
+import jnpf.receiptout.mapper.ReceiptoutMapper;
+import jnpf.receiptout.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 jnpf.permission.service.AuthorizeService;
-import jnpf.receiptout.entity.ReceiptoutEntity;
-import jnpf.receiptout.entity.Receiptout_item0Entity;
-import jnpf.receiptout.mapper.ReceiptoutMapper;
+
+
 import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
-import jnpf.receiptout.service.ReceiptoutService;
-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.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.*;
 
 /**
  *
@@ -29,10 +38,10 @@ import java.util.List;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 @Service
-public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, ReceiptoutEntity> implements ReceiptoutService {
+public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, ReceiptoutEntity> implements ReceiptoutService{
 
 
     @Autowired
@@ -42,6 +51,9 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     private AuthorizeService authorizeService;
 
 
+    @Autowired
+    private Receiptout_item0Service receiptout_item0Service;
+
 
 
 
@@ -100,6 +112,11 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 			if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
             receiptoutNum++;
             receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getDocumentNo,receiptoutPagination.getDocumentNo());
+                    }
+
+			if(StringUtil.isNotEmpty(receiptoutPagination.getType())){
+            receiptoutNum++;
+                receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType());
                     }
 
 			if(StringUtil.isNotEmpty(receiptoutPagination.getCustomerName())){
@@ -112,7 +129,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         }
         //排序
         if(StringUtil.isEmpty(receiptoutPagination.getSidx())){
-        receiptoutQueryWrapper.lambda().orderByDesc(ReceiptoutEntity::getCreatorTime);
+        receiptoutQueryWrapper.lambda().orderByDesc(ReceiptoutEntity::getId);
         }else{
             try {
                 String sidx = receiptoutPagination.getSidx();
@@ -189,6 +206,11 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 			if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
             receiptoutNum++;
             receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getDocumentNo,receiptoutPagination.getDocumentNo());
+                    }
+
+			if(StringUtil.isNotEmpty(receiptoutPagination.getType())){
+            receiptoutNum++;
+                receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType());
                     }
 
 			if(StringUtil.isNotEmpty(receiptoutPagination.getCustomerName())){
@@ -201,7 +223,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 				}
         //排序
         if(StringUtil.isEmpty(receiptoutPagination.getSidx())){
-        receiptoutQueryWrapper.lambda().orderByDesc(ReceiptoutEntity::getCreatorTime);
+        receiptoutQueryWrapper.lambda().orderByDesc(ReceiptoutEntity::getId);
         }else{
             try {
             	String sidx = receiptoutPagination.getSidx();
@@ -252,6 +274,12 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         }
     }
     //子表方法
+		@Override
+		public List<Receiptout_item0Entity> GetReceiptout_item0List(String id){
+				QueryWrapper<Receiptout_item0Entity> queryWrapper = new QueryWrapper<>();
+				queryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId, id);
+				return receiptout_item0Service.list(queryWrapper);
+				}
 
     //列表子表数据方法
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java
index 7cd926c3..b5eab109 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/Receiptout_item0ServiceImpl.java
@@ -1,10 +1,30 @@
 package jnpf.receiptout.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.receiptout.entity.Receiptout_item0Entity;
+import jnpf.receiptout.entity.*;
 import jnpf.receiptout.mapper.Receiptout_item0Mapper;
-import jnpf.receiptout.service.Receiptout_item0Service;
+import jnpf.receiptout.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 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
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-12
+ * 日期： 2023-02-08
  */
 @Service
-public class Receiptout_item0ServiceImpl extends ServiceImpl<Receiptout_item0Mapper, Receiptout_item0Entity> implements Receiptout_item0Service {
+public class Receiptout_item0ServiceImpl extends ServiceImpl<Receiptout_item0Mapper, Receiptout_item0Entity> implements Receiptout_item0Service{
 
 
 }
\ No newline at end of file
diff --git a/SC-web/src/router/index.js b/SC-web/src/router/index.js
index 6ddb3e64..9704e996 100644
--- a/SC-web/src/router/index.js
+++ b/SC-web/src/router/index.js
@@ -5,6 +5,7 @@ Vue.use(Router)
 
 /* Layout */
 import Layout from '@/layout'
+import pament from '@/views/scm/basicInformation/paymentdoc/Form'
 
 /* Router Modules */
 
@@ -58,6 +59,11 @@ export const constantRoutes = [{
     path: '/auth-redirect',
     component: (resolve) => require(['@/views/login/auth-redirect'], resolve),
     hidden: true
+  },
+  {
+    path:'/paymentdoc',
+    component: (resolve) => require(['@/views/scm/basicInformation/paymentdoc/index'],resolve),
+    hidden: true
   }
 ]
 
@@ -84,4 +90,4 @@ export function resetRouter() {
   router.matcher = newRouter.matcher // reset router
 }
 
-export default router
\ No newline at end of file
+export default router
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
index 3a43ffe0..0dad270b 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
@@ -159,9 +159,17 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="orderId" label="采购订单行id">
                 <template slot-scope="scope">
-                    <el-input   v-model="scope.row.orderId"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-                </el-input>
+<!--                    <el-input   v-model="scope.row.orderId"-->
+<!-- placeholder="请输入"  clearable  :style='{"width":"100%"}'>-->
+<!--                </el-input>-->
+                  <popupSelect   v-model="scope.row.orderId"
+                                 placeholder="请选择"  clearable  :field="'orderId'+scope.$index"
+
+                                 interfaceId="383149471917185157" :columnOptions="jg_paymentdoc_item0orderIdcolumnOptions"
+                                 propsValue="id" relationField="document_no" popupType="dialog"
+                                 popupWidth="800px" @change="popupSelectChangeOrderId"
+                                 hasPage :pageSize="20"   >
+                  </popupSelect>
             </template>
         </el-table-column>
             <el-table-column prop="amount" label="金额">
@@ -277,7 +285,7 @@
                         settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                         statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
-
+                        jg_paymentdoc_item0orderIdcolumnOptions:[{"label":"单据编号","value":"document_no"},{"label":"金额","value":"amount"},],
                         taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
         }
         },
@@ -287,6 +295,14 @@
         },
         mounted() {},
         methods: {
+          popupSelectChangeOrderId(a, b){
+            for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
+              if(a == this.dataForm.paymentdoc_item0List[i].orderId){
+                this.dataForm.paymentdoc_item0List[i].amount = b.amount;
+
+              }
+            }
+          },
 				paymentdoc_item0Exist() {
 				let isOk = true;
 					for(let i=0;i<this.dataForm.paymentdoc_item0List.length;i++){
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index b9567787..d7c0d007 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -28,6 +28,8 @@
                                     </el-button>
                                     <el-button type="primary" icon="el-icon-plus"  @click="pigeonhole()">归档
                                     </el-button>
+                                    <el-button type="primary" icon="el-icon-plus"  @click="payment()">付款申请
+                                    </el-button>
                     </div>
                     <div class="JNPF-common-head-right">
                         <el-tooltip effect="dark" content="刷新" placement="top">
@@ -103,9 +105,17 @@
     import ExportBox from './ExportBox'
     import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
     import Detail from './Detail'
+    import pament from '@/views/scm/basicInformation/paymentdoc/Form'
 
     export default {
         components: {JNPFForm, ExportBox,Detail},
+      // routes:[
+      //   {
+      //     path:'/paymentdoc',
+      //     name:'payment',
+      //     component:pament
+      //   }
+      // ],
         data() {
             return {
                 detailVisible: false,
@@ -146,7 +156,7 @@
                 ],
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                             currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}],
+                                statusOptions:[{"fullName":"待开票","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款中","id":"2"},{"fullName":"归档","id":"3"}],
                             statusProps:{"label":"fullName","value":"id"},
             }
         },
@@ -250,11 +260,70 @@
                     this.$refs.JNPFForm.init(id, isDetail)
                 })
             },
-            pigeonhole(id,isDetail){
-              this.$nextTick(() => {
-                this.$refs.JNPFForm.init(id,isDetail)
+            pigeonhole(){
+              if (!this.multipleSelection.length) {
+                this.$message({
+                  type: 'error',
+                  message: '请选择一条数据',
+                  duration: 1500,
+                })
+                return
+              }
+              // let id = {}
+              let id = this.multipleSelection.join()
+              let param ={};
+              param = this.list.find(function(param) {
+                return param.id == id;
+              })
+              debugger
+              request({
+                url: `/api/purchaseorder/Purchaseorder/pigeonhole`,
+                method: 'POST',
+                data: param
+              }).then(res => {
+                this.$message({
+                  type: 'success',
+                  message: res.msg,
+                  onClose: () => {
+                    this.initData()
+                  }
+                });
               })
             },
+          payment(){
+            if (!this.multipleSelection.length) {
+              this.$message({
+                type: 'error',
+                message: '请选择一条数据',
+                duration: 1500,
+              })
+              return
+            }
+            let ids = this.multipleSelection.join()
+            if (this.multipleSelection.length ===1){
+              let info = {};
+              info = this.list.find(function(info) {
+                return info.id == ids
+              })
+              if (info.amount != info.invoiceAmount){
+                this.$message({
+                  type: 'error',
+                  message: '请先开具发票',
+                  duration: 1500,
+                })
+                return
+              }else{
+                debugger
+                // window.navigator("views/scm/basicInformation/paymentdoc/index.vue");
+                // window.location.href="views/scm/basicInformation/paymentdoc/index.vue";
+                // this.formVisible = true
+                // this.$nextTick((id,isDetail) => {
+                //   this.$refs.JNPFForm.init(id, isDetail)
+                // })
+                this.$router.push({path:'/paymentdoc'})
+              }
+            }
+          },
             exportData() {
                 this.exportBoxVisible = true
                 this.$nextTick(() => {
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
index d2f2848a..455b9318 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Detail.vue
@@ -2,70 +2,146 @@
 <el-dialog title="详情"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
+           width="1000px">
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="单据编号"  
+            <el-col :span="8" >
+                <el-form-item  label="单据编号"
  prop="documentno" >
                         <p>{{dataForm.documentno}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="suppliername" >
-                        <p>{{dataForm.suppliername}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="业务类型"
+ prop="type" >
+                         <p>{{ dataForm.type | dynamicText(typeOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="入库金额"  
- prop="receiptamount" >
-                        <p>{{dataForm.receiptamount}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="来源单号"
+ prop="souceno" >
+                        <p>{{dataForm.souceno}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="入库数量"  
- prop="receiptnum" >
-                        <p>{{dataForm.receiptnum}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="入库金额"
+ prop="receiptamount" >
+                        <p>{{dataForm.receiptamount}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="币别"  
+            <el-col :span="8" >
+                <el-form-item  label="币别"
  prop="currency" >
                          <p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <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="souceno" >
-                        <p>{{dataForm.souceno}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="入库数量"
+ prop="receiptnum" >
+                        <p>{{dataForm.receiptnum}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="业务类型"  
- prop="type" >
-                         <p>{{ dataForm.type | dynamicText(typeOptions) }} </p>
+            <el-col :span="8" >
+                <el-form-item  label="供应商名称"
+ prop="suppliername" >
+                        <p>{{dataForm.suppliername}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"  
+            <el-col :span="16" >
+                <el-form-item  label="备注"
  prop="remark" >
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
             <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" >
                          <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
                 </el-form-item>
             </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>
 </el-form>
     </el-row>
@@ -90,28 +166,27 @@
             dataForm: {
                 id :'',
                             documentno : '',
-                            suppliername : '',
+                            type : "",
+                            souceno : "",
                             receiptamount : '',
+                            currency : "0",
                             receiptnum : '',
-                            currency : "",
-                            warehousingdate : '',
-                            souceno : '',
-                            type : "",
+                            suppliername : '',
                             remark : '',
-                            status : "",
+                            warehousingdate : '',
+                            status : "0",
                             creatorTime : "",
                             creatorUserName : "",
-                            creatorUserId : "",
-                            lastModifyUserName : "",
-                            lastModifyUserId : "",
-                            lastModifyTime : "",
-                            orgnizeId : "",
-                            departmentId : "",
+                        receiptin_item0List:[],
             },
+                            activevpzhms:'0',
+                                typeOptions:[{"fullName":"采购入库","id":"0"},{"fullName":"购销入库","id":"1"}],
                                 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"}],
 
+                                    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: {},
@@ -123,6 +198,9 @@
         methods: {
             dataInfo(dataAll){
                 let _dataAll =dataAll
+                for(let i=0;i<_dataAll.receiptin_item0List.length;i++){
+                    var _list = _dataAll.receiptin_item0List[i];
+                }
                 this.dataForm = _dataAll
             },
 
@@ -133,7 +211,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/example/Receiptin/detail/'+this.dataForm.id,
+                            url: '/api/receiptin/Receiptin/detail/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
index b0a68a0c..fdf1e2bd 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
@@ -2,48 +2,51 @@
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
+           width="1000px">
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="12" >
-                <el-form-item  label="单据编号"  
+            <el-col :span="8" >
+                <el-form-item  label="单据编号"
  prop="documentno" >
                     <el-input    v-model="dataForm.documentno"
- placeholder="请输入单据编号"  readonly  clearable  :style='{"width":"100%"}'>
+ placeholder="系统自动生成"  readonly >
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="suppliername" >
-                    <el-input    v-model="dataForm.suppliername"
- placeholder="请输入供应商名称"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="业务类型"
+ prop="type" >
+                    <el-select    v-model="dataForm.type"
+ 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-col>
-            <el-col :span="12" >
-                <el-form-item  label="入库金额"  
- prop="receiptamount" >
-                    <el-input    v-model="dataForm.receiptamount"
- placeholder="请输入入库金额"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="来源单号"
+ prop="souceno" >
+                    <popupSelect    v-model="dataForm.souceno"
+ 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-col>
-            <el-col :span="12" >
-                <el-form-item  label="入库数量"  
- prop="receiptnum" >
-                    <el-input    v-model="dataForm.receiptnum"
- placeholder="请输入入库数量"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="入库金额"
+ prop="receiptamount" >
+                    <el-input    v-model="dataForm.receiptamount"
+ placeholder="请输入入库金额"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="币别"  
+            <el-col :span="8" >
+                <el-form-item  label="币别"
  prop="currency" >
                     <el-select    v-model="dataForm.currency"
  placeholder="请选择币别"  clearable  :style='{"width":"100%"}'>
@@ -52,45 +55,44 @@
                 </el-select>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <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="souceno" >
-                    <el-input    v-model="dataForm.souceno"
- placeholder="请输入来源单号"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="入库数量"
+ prop="receiptnum" >
+                    <el-input    v-model="dataForm.receiptnum"
+ placeholder="请输入入库数量"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="业务类型"  
- prop="type" >
-                    <el-select    v-model="dataForm.type"
- 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-col :span="8" >
+                <el-form-item  label="供应商名称"
+ prop="suppliername" >
+                    <el-input    v-model="dataForm.suppliername"
+ placeholder="请输入供应商名称"  clearable  :style='{"width":"100%"}'>
 
-                </el-select>
+                </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"  
+            <el-col :span="16" >
+                <el-form-item  label="备注"
  prop="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-form-item>
             </el-col>
             <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" >
                     <el-select    v-model="dataForm.status"
  placeholder="请选择单据状态"  clearable  :style='{"width":"100%"}'>
@@ -99,6 +101,121 @@
                 </el-select>
                 </el-form-item>
             </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>
 </el-form>
     </el-row>
@@ -122,24 +239,20 @@
                 isDetail: false,
             dataForm: {
                             documentno : '',
-                            suppliername : '',
+                            type : "",
+                            souceno : "",
                             receiptamount : '',
+                            currency : "0",
                             receiptnum : '',
-                            currency : "",
-                            warehousingdate : '',
-                            souceno : '',
-                            type : "",
+                            suppliername : '',
                             remark : '',
-                            status : "",
+                            warehousingdate : '',
+                            status : "0",
                             creatorTime : "",
                             creatorUserName : "",
-                            creatorUserId : "",
-                            lastModifyUserName : "",
-                            lastModifyUserId : "",
-                            lastModifyTime : "",
-                            orgnizeId : "",
-                            departmentId : "",
+                        receiptin_item0List:[],
             },
+                            activevpzhms:'0',
             rules:
             {
                             receiptamount: [
@@ -147,18 +260,62 @@
                             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"}],
-                        typeOptions:[{"fullName":"购销入库","id":"0"},{"fullName":"采购入库","id":"1"}],
                         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: {},
-        watch: {},
+        watch: {
+        },
         created() {
         },
         mounted() {},
         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){
                 for (let key in data) {
                     if (data[key] instanceof Array) {
@@ -179,7 +336,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/example/Receiptin/'+this.dataForm.id,
+                            url: '/api/receiptin/Receiptin/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
@@ -195,6 +352,7 @@
             dataFormSubmit() {
                 this.$refs['elForm'].validate((valid) => {
                     if (valid) {
+                            if (!this.receiptin_item0Exist()) return
                             this.request()
                     }
                 })
@@ -203,7 +361,7 @@
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
-                        url: '/api/example/Receiptin',
+                        url: '/api/receiptin/Receiptin',
                         method: 'post',
                         data: _data
                     }).then((res) => {
@@ -219,7 +377,7 @@
                     })
                 }else{
                     request({
-                        url: '/api/example/Receiptin/'+this.dataForm.id,
+                        url: '/api/receiptin/Receiptin/'+this.dataForm.id,
                         method: 'PUT',
                         data: _data
                     }).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(){
                 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;
             },
             dataInfo(dataAll){
                 let _dataAll =dataAll
+                    for(let i=0;i<_dataAll.receiptin_item0List.length;i++){
+                        var _list = _dataAll.receiptin_item0List[i];
+                    }
                 this.dataForm = _dataAll
             },
         },
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/index.vue b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
index 235bcada..4ba9ae28 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/index.vue
@@ -10,8 +10,13 @@
                                 </el-form-item>
                             </el-col>
                         <el-col :span="6">
-                                <el-form-item label="供应商名称">
-                                        <el-input v-model="query.suppliername" placeholder="请输入" clearable>  </el-input>
+                                <el-form-item label="单据状态">
+                                        <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-col>
                     <el-col :span="6">
@@ -56,6 +61,8 @@
                                     </template>
                                 </el-table-column>
                             <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"
 >
@@ -63,19 +70,17 @@
                                         {{ scope.row.type | dynamicText(typeOptions) }}
                                     </template>
                                 </el-table-column>
+                            <el-table-column prop="remark" label="备注" width="0" align="left"
+/>
                                 <el-table-column label="单据状态" width="0" prop="status" algin="left"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.status | dynamicText(statusOptions) }}
                                     </template>
                                 </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="remark" label="备注" width="0" align="left"
+                            <el-table-column prop="creatorTime" 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"
 width="150" >
@@ -115,7 +120,7 @@ width="150" >
                 detailVisible: false,
                 query: {
                                 documentno:undefined,
-                                suppliername:undefined,
+                                status:undefined,
                 },
                 treeProps: {
                     children: 'children',
@@ -140,17 +145,17 @@ width="150" >
                     {prop: 'receiptnum', label: '入库数量'},
                     {prop: 'currency', label: '币别'},
                     {prop: 'warehousingdate', label: '入库日期'},
+                    {prop: 'souceno', label: '来源单号'},
                     {prop: 'type', label: '业务类型'},
+                    {prop: 'remark', label: '备注'},
                     {prop: 'status', label: '单据状态'},
+                    {prop: 'creatorTime', 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"}],
                             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"}],
                             statusProps:{"label":"fullName","value":"id"},
             }
@@ -183,7 +188,7 @@ width="150" >
                     menuId:this.menuId
                 };
                 request({
-                    url: `/api/example/Receiptin/getList`,
+                    url: `/api/receiptin/Receiptin/getList`,
                     method: 'post',
                     data: _query
                 }).then(res => {
@@ -203,7 +208,7 @@ width="150" >
                     type: 'warning'
                 }).then(() => {
                     request({
-                        url: `/api/example/Receiptin/${id}`,
+                        url: `/api/receiptin/Receiptin/${id}`,
                         method: 'DELETE'
                     }).then(res => {
                         this.$message({
@@ -235,7 +240,7 @@ width="150" >
                         type: 'warning'
                     }).then(() => {
                         request({
-                            url: `/api/example/Receiptin/batchRemove/${ids}`,
+                            url: `/api/receiptin/Receiptin/batchRemove/${ids}`,
                             method: 'DELETE'
                         }).then(res => {
                             this.$message({
@@ -264,7 +269,7 @@ width="150" >
             download(data) {
                 let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
                 request({
-                    url: `/api/example/Receiptin/Actions/Export`,
+                    url: `/api/receiptin/Receiptin/Actions/Export`,
                     method: 'GET',
                     data: query
                 }).then(res => {
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
index 6fc6062d..ec073a6b 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
@@ -6,66 +6,142 @@
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="24" >
+            <el-col :span="8" >
                 <el-form-item  label="单据编号"  
  prop="documentNo" >
                         <p>{{dataForm.documentNo}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="客户名称"  
- prop="customerName" >
-                        <p>{{dataForm.customerName}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="业务类型"  
+ prop="type" >
+                         <p>{{ dataForm.type | dynamicText(typeOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8" >
+                <el-form-item  label="来源单号"  
+ prop="sourceNo" >
+                        <p>{{dataForm.sourceNo}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="8" >
                 <el-form-item  label="出库金额"  
  prop="amount" >
                         <p>{{dataForm.amount}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="出库数量"  
- prop="num" >
-                        <p>{{dataForm.num}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
+            <el-col :span="8" >
                 <el-form-item  label="币别"  
  prop="currency" >
                          <p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="出库日期"  
- prop="issueDate" >
-                        <p>{{jnpf.dateFormat(dataForm.issueDate)}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="来源单号"  
- prop="sourceNo" >
-                        <p>{{dataForm.sourceNo}}</p>
+            <el-col :span="8" >
+                <el-form-item  label="出库数量"  
+ prop="num" >
+                        <p>{{dataForm.num}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="业务类型"  
- prop="type" >
-                         <p>{{ dataForm.type | dynamicText(typeOptions) }} </p>
+            <el-col :span="8" >
+                <el-form-item  label="客户名称"  
+ prop="customerName" >
+                        <p>{{dataForm.customerName}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="16" >
                 <el-form-item  label="备注"  
  prop="remark" >
                         <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="12" >
+                <el-form-item  label="出库日期"  
+ prop="issueDate" >
+                        <p>{{jnpf.dateFormat(dataForm.issueDate)}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
                 <el-form-item  label="单据状态"  
  prop="status" >
                          <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
                 </el-form-item>
             </el-col>
+            <el-col :span="24">
+                <el-tabs  v-model="activefqhgdj"  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.receiptout_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="库区id">
+            <template slot-scope="scope">
+                            <p>{{scope.row.reservoirareaId}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="warehouseId" label="仓库id">
+            <template slot-scope="scope">
+                            <p>{{scope.row.warehouseId}}</p>
+        </template>
+        </el-table-column>
+            <el-table-column prop="deliveryNum" label="出库数量">
+            <template slot-scope="scope">
+                            <p>{{scope.row.deliveryNum}}</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="deleteUserId" label="磅单类型">
+            <template slot-scope="scope">
+                        <p>{{ scope.row.deleteUserId | dynamicText(deleteUserIdOptions) }}</p>
+        </template>
+        </el-table-column>
+    </el-table>
+    </el-form-item>
+    </el-col>
+            </el-tab-pane >
+            </el-tabs>
+                </el-col>
     </template>
 </el-form>
     </el-row>
@@ -90,28 +166,29 @@
             dataForm: {
                 id :'',
                             documentNo : '',
-                            customerName : '',
+                            type : "0",
+                            sourceNo : "XS002",
                             amount : '',
+                            currency : "0",
                             num : '',
-                            currency : "",
-                            issueDate : '',
-                            sourceNo : '',
-                            type : "",
+                            customerName : '',
                             remark : '',
-                            status : "",
+                            issueDate : '',
+                            status : "0",
                             creatorTime : "",
                             creatorUserName : "",
-                            creatorUserId : "",
-                            lastModifyUserName : "",
-                            lastModifyUserId : "",
                             lastModifyTime : "",
-                            orgnizeId : "",
-                            departmentId : "",
+                            lastModifyUserName : "",
+                        receiptout_item0List:[],
             },
+                            activefqhgdj:'0',
+                                typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
                                 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"}],
 
+                                    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"}],
+                                    deleteUserIdOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其它","id":"1"}],
         }
         },
         computed: {},
@@ -123,6 +200,9 @@
         methods: {
             dataInfo(dataAll){
                 let _dataAll =dataAll
+                for(let i=0;i<_dataAll.receiptout_item0List.length;i++){
+                    var _list = _dataAll.receiptout_item0List[i];
+                }
                 this.dataForm = _dataAll
             },
 
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index ba46809b..af3fe4fd 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -2,103 +2,220 @@
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
+           width="1500px">
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-            <el-col :span="24" >
-                <el-form-item  label="单据编号"  
+            <el-col :span="8" >
+                <el-form-item  label="单据编号"
  prop="documentNo" >
                     <el-input    v-model="dataForm.documentNo"
- placeholder="请输入单据编号"  readonly  clearable  :style='{"width":"100%"}'>
+ placeholder="系统自动生成"  readonly >
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="客户名称"  
- prop="customerName" >
-                    <el-input    v-model="dataForm.customerName"
- placeholder="请输入客户名称"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="业务类型"
+ prop="type" >
+                    <el-select    v-model="dataForm.type"
+ 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-col>
-            <el-col :span="24" >
-                <el-form-item  label="出库金额"  
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入出库金额"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="来源单号"
+ prop="sourceNo" >
+                    <popupSelect    v-model="dataForm.sourceNo"
+ placeholder="请选择"  clearable  field="sourceNo" interfaceId="392956668264114117" :columnOptions="sourceNocolumnOptions" propsValue="document_no" relationField="document_no" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"  @change="popupSelectChangeSourceNo" >
 
-                </el-input>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="出库数量"  
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入出库数量"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="出库金额"
+ prop="amount" >
+                    <el-input    v-model="dataForm.amount"
+ placeholder="请输入出库金额"  readonly  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="币别"  
+            <el-col :span="8" >
+                <el-form-item  label="币别"
  prop="currency" >
                     <el-select    v-model="dataForm.currency"
- placeholder="请选择币别"  clearable  :style='{"width":"100%"}'>
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
                 </el-select>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="出库日期"  
- prop="issueDate" >
-                    <el-date-picker    v-model="dataForm.issueDate"
- placeholder="请选择出库日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
-
-                </el-date-picker>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="来源单号"  
- prop="sourceNo" >
-                    <el-input    v-model="dataForm.sourceNo"
- placeholder="请输入来源单号"  clearable  :style='{"width":"100%"}'>
+            <el-col :span="8" >
+                <el-form-item  label="出库数量"
+ prop="num" >
+                    <el-input    v-model="dataForm.num"
+ placeholder="请输入出库数量"  readonly  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="业务类型"  
- prop="type" >
-                    <el-select    v-model="dataForm.type"
- 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-col :span="8" >
+                <el-form-item  label="客户名称"
+ prop="customerName" >
+                    <el-input    v-model="dataForm.customerName"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-                </el-select>
+                </el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"  
+            <el-col :span="16" >
+                <el-form-item  label="备注"
  prop="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-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="单据状态"  
+            <el-col :span="12" >
+                <el-form-item  label="出库日期"
+ prop="issueDate" >
+                    <el-date-picker    v-model="dataForm.issueDate"
+ 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" >
                     <el-select    v-model="dataForm.status"
- placeholder="请选择单据状态"  clearable  :style='{"width":"100%"}'>
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
                             <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-col>
+            <el-col :span="24">
+                <el-tabs  v-model="activefqhgdj"  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.receiptout_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"  interfaceId="392933248017164229" :bissId="dataForm.sourceNo" :columnOptions="receiptout_item0licenseNocolumnOptions" propsValue="license_num" relationField="license_num" popupType="dialog"
+ popupWidth="800px"
+ hasPage :pageSize="20"   @change="popupSelectlicenseNo" >
+                </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":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="reservoirareaId" label="库区id">
+                <template slot-scope="scope">
+                    <popupSelect   v-model="scope.row.reservoirareaId"
+ placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="392939299932268421" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
+ popupWidth="800px" @change="popupSelectChangeReservoirarea"
+  >
+                </popupSelect>
+            </template>
+        </el-table-column>
+            <el-table-column prop="warehouseId" label="仓库id">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.warehouseId"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="deliveryNum" label="出库数量">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.deliveryNum"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                </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":"100%"}'>
+                            <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":"100%"}'>
+                </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":"100%"}'>
+                            <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":"100%"}'>
+                </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":"100%"}'>
+                </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":"100%"}'>
+                </el-input>
+            </template>
+        </el-table-column>
+            <el-table-column prop="deleteUserId" label="磅单类型">
+                <template slot-scope="scope">
+                    <el-select   v-model="scope.row.deleteUserId"
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in deleteUserIdOptions" :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="delreceiptout_item0List(scope.$index)">删除</el-button>
+        </template>
+    </el-table-column>
+    </el-table>
+    <div class="table-actions" @click="addreceiptout_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>
 </el-form>
     </el-row>
@@ -122,35 +239,49 @@
                 isDetail: false,
             dataForm: {
                             documentNo : '',
-                            customerName : '',
+                            type : "0",
+                            sourceNo : "XS002",
                             amount : '',
+                            currency : "0",
                             num : '',
-                            currency : "",
-                            issueDate : '',
-                            sourceNo : '',
-                            type : "",
+                            customerName : '',
                             remark : '',
-                            status : "",
+                            issueDate : '',
+                            status : "0",
                             creatorTime : "",
                             creatorUserName : "",
-                            creatorUserId : "",
-                            lastModifyUserName : "",
-                            lastModifyUserId : "",
                             lastModifyTime : "",
-                            orgnizeId : "",
-                            departmentId : "",
+                            lastModifyUserName : "",
+                        receiptout_item0List:[],
             },
+                            activefqhgdj:'0',
             rules:
             {
-                            amount: [
+                            type: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
                         ],
-                            num: [
+                            sourceNo: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'change'
+                                },
                         ],
             },
+                        typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
+                        sourceNocolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"币别","value":"currency"}, {"label":"客户名称","value":"costomer_name"},],
                         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"}],
 
+                        receiptout_item0licenseNocolumnOptions:[ {"label":"车辆号","value":"license_no"}, {"label":"库区名称","value":"out_area"}, {"label":"物料名称","value":"material_name"}, {"label":"出库数量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"含税单价","value":"unit_price"}, {"label":"税率","value":"rate"}, {"label":"金额","value":"price"}, {"label":"批次号","value":"poundlist_id"}, {"label":"磅单类型","value":"pound_type"},],
+                        receiptout_item0reservoirareaIdcolumnOptions:[ {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"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"}],
+                        deleteUserIdOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其它","id":"1"}],
         }
         },
         computed: {},
@@ -159,6 +290,45 @@
         },
         mounted() {},
         methods: {
+          popupSelectChangeSourceNo(e,d){
+            this.dataForm.customerName = d.costomer_name;
+            this.dataForm.currency = d.currency;
+          },
+          popupSelectlicenseNo(a, b){
+            for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+              if(a == this.dataForm.receiptout_item0List[i].licenseNo){
+                this.dataForm.receiptout_item0List[i].materialName = b.material_name;
+                this.dataForm.receiptout_item0List[i].deliveryNum = b.settlement;
+                this.dataForm.receiptout_item0List[i].unit = b.unit;
+                this.dataForm.receiptout_item0List[i].price = b.unit_price;
+                this.dataForm.receiptout_item0List[i].rate = b.rate;
+                this.dataForm.receiptout_item0List[i].amount = b.price;
+                this.dataForm.receiptout_item0List[i].batchNo = b.poundlist_id;
+                this.dataForm.receiptout_item0List[i].deleteUserId = b.pound_type;
+                this.dataForm.receiptout_item0List[i].rateAmount = b.price * b.rate;
+
+                this.dataForm.receiptout_item0List[i].reservoirareaId = b.out_area;
+              }
+            }
+          },
+
+          popupSelectChangeReservoirarea(a,b){
+            for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+              if(a == this.dataForm.receiptout_item0List[i].reservoirareaId){
+                this.dataForm.receiptout_item0List[i].warehouseId = b.name;
+
+              }
+            }
+          },
+
+
+				receiptout_item0Exist() {
+				let isOk = true;
+					for(let i=0;i<this.dataForm.receiptout_item0List.length;i++){
+						const e = this.dataForm.receiptout_item0List[i];
+					}
+				return isOk;
+			},
             clearData(data){
                 for (let key in data) {
                     if (data[key] instanceof Array) {
@@ -195,6 +365,7 @@
             dataFormSubmit() {
                 this.$refs['elForm'].validate((valid) => {
                     if (valid) {
+                            if (!this.receiptout_item0Exist()) return
                             this.request()
                     }
                 })
@@ -235,12 +406,38 @@
                     })
                 }
             },
+                addreceiptout_item0List(){
+                    let item = {
+                            licenseNo:undefined,
+                            materialName:undefined,
+                            reservoirareaId:undefined,
+                            warehouseId:undefined,
+                            deliveryNum:undefined,
+                            unit:undefined,
+                            price:undefined,
+                            rate:undefined,
+                            amount:undefined,
+                            rateAmount:undefined,
+                            batchNo:undefined,
+                            deleteUserId:undefined,
+                }
+                    this.dataForm.receiptout_item0List.push(item)
+                },
+                delreceiptout_item0List(index) {
+                    this.dataForm.receiptout_item0List.splice(index, 1);
+                },
             dataList(){
                 var _data = JSON.parse(JSON.stringify(this.dataForm));
+                    for(let i=0;i<_data.receiptout_item0List.length;i++){
+                        var _list = _data.receiptout_item0List[i];
+                    }
                 return _data;
             },
             dataInfo(dataAll){
                 let _dataAll =dataAll
+                    for(let i=0;i<_dataAll.receiptout_item0List.length;i++){
+                        var _list = _dataAll.receiptout_item0List[i];
+                    }
                 this.dataForm = _dataAll
             },
         },
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 8ded7352..10473865 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -9,6 +9,16 @@
                                         <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
                                 </el-form-item>
                             </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="业务类型">
+                                        <el-select v-model="query.type" placeholder="请选择"
+                                                   clearable>
+                                            <el-option v-for="(item, index) in typeOptions" :key="index"
+                                                       :label="item.fullName" :value="item.id"
+                                                       :disabled="item.disabled"></el-option>
+                                        </el-select>
+                                </el-form-item>
+                            </el-col>
                         <el-col :span="6">
                                 <el-form-item label="客户名称">
                                         <el-input v-model="query.customerName" placeholder="请输入" clearable>  </el-input>
@@ -46,9 +56,9 @@
                             <el-table-column prop="customerName" label="客户名称" width="0" align="left"
 />
                             <el-table-column prop="amount" label="出库金额" width="0" align="left"
- sortable="custom" />
+/>
                             <el-table-column prop="num" label="出库数量" width="0" align="left"
- sortable="custom" />
+/>
                                 <el-table-column label="币别" width="0" prop="currency" algin="left"
 >
                                     <template slot-scope="scope">
@@ -74,8 +84,8 @@
                                     </template>
                                 </el-table-column>
                             <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="creatorUserName" label="创建人" width="0" align="left"
+/>
+                            <el-table-column prop="creatorUserName" label="创建人名称" width="0" align="left"
 />
                         <el-table-column label="操作" fixed="right"
 width="150" >
@@ -115,6 +125,7 @@ width="150" >
                 detailVisible: false,
                 query: {
                                 documentNo:undefined,
+                                type:undefined,
                                 customerName:undefined,
                 },
                 treeProps: {
@@ -129,7 +140,7 @@ width="150" >
                         currentPage: 1,
                         pageSize: 20,
                     sort: "desc",
-                    sidx: "creatorTime",
+                    sidx: "",
                 },
                 formVisible: false,
                 exportBoxVisible: false,
@@ -145,12 +156,12 @@ width="150" >
                     {prop: 'remark', label: '备注'},
                     {prop: 'status', label: '单据状态'},
                     {prop: 'creatorTime', label: '创建时间'},
-                    {prop: 'creatorUserName', label: '创建人'},
+                    {prop: 'creatorUserName', label: '创建人名称'},
                 ],
+                                typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
+                            typeProps:{"label":"fullName","value":"id"},
                                 currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                             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"}],
                             statusProps:{"label":"fullName","value":"id"},
             }
@@ -279,7 +290,7 @@ width="150" >
                         currentPage: 1,
                         pageSize: 20,
                     sort: "desc",
-                    sidx: "creatorTime",
+                    sidx: "",
                 }
                 this.initData()
             },