自动带出合同信息

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml

@@ -302,6 +302,43 @@
           AND g.f_status = 2
     </select>
 
+
+    <select id="queryBusinessContract" resultMap="contractList">
+        SELECT
+            a.*,
+            b.name AS firstSupplyName,
+            c.f_full_name AS enterpriseName,
+            d.contract_name AS relatedContractName,
+            e.name AS secondSupplyName,
+            f.name AS thirdSupplyName,
+            h.name AS businessName
+        FROM
+            jg_contract a
+                LEFT JOIN jg_subject_basic b ON a.subject = b.id
+                AND b.f_delete_mark IS NULL
+                LEFT JOIN base_organize c ON a.dept_id = c.f_id
+                AND c.f_delete_mark IS NULL
+                LEFT JOIN jg_contract d ON a.related_contract_id = d.id
+                AND d.f_delete_mark IS NULL
+                LEFT JOIN jg_subject_basic e ON a.subject2 = e.id
+                AND e.f_delete_mark IS NULL
+                LEFT JOIN jg_subject_basic f ON a.subject3 = f.id
+                AND f.f_delete_mark IS NULL
+                LEFT JOIN flow_task g ON a.id = g.f_process_id and g.f_delete_mark is null
+                LEFT JOIN jg_business_line h ON a.business_id=h.id    AND h.f_delete_mark IS NULL
+        WHERE
+            a.contract_type = '1'
+          AND a.business_id = #{businessLine}
+          AND a.contract_number = #{contractNumber}
+
+          AND DATE_FORMAT( a.contract_period_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+          AND DATE_FORMAT( a.contract_period_time_end, '%Y-%m-%d' ) &gt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+          AND a.f_delete_mark IS NULL
+          AND a.organize_json_id like concat('%',#{organize},'%')
+          AND g.f_status = 2
+    </select>
+
+
     <select id="querySaleOrder" resultMap="saleOrder">
         SELECT
             a.*,

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountMapper.xml

@@ -40,7 +40,7 @@
         LEFT JOIN base_user i ON i.f_Id = a.f_creator_user_id
         AND i.f_delete_mark
         IS NULL LEFT JOIN base_user i1 ON i1.f_Id = a.f_last_modify_user_id
-        AND i1.f_delete_mark
+        AND i1.f_delete_mark IS NULL
         ${ew.customSqlSegment}
         GROUP BY
         a.id

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml

@@ -719,6 +719,22 @@
             b.id= #{id}
     </select>
 
+
+    <select id="queryVoucherByBusinessOrder2" resultType="java.math.BigDecimal">
+        SELECT
+            IFNULL( round( sum( a.purchase_amount ), 2 ), 0 ) AS purchaseAmount
+        FROM
+            jg_voucher a
+                LEFT JOIN jg_voucher_product b ON a.id = b.voucher_id
+                AND b.f_delete_mark
+                                                      IS NULL LEFT JOIN jg_voucher c ON a.voucher_relation = c.id
+                AND c.f_delete_mark
+        WHERE
+            a.f_delete_mark IS NULL
+          AND a.is_transfer = '2'
+          AND a.business_order_id = #{id}
+    </select>
+
     <select id="queryAmountByBusinessOrder" resultType="java.util.Map">
         select
             IFNULL(SUM(a.sale_amount), 0 ) AS saleAmount,

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java

@@ -79,4 +79,7 @@ public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
     List<HashMap<String, Object>> getOrderInfo2(@Param("code") String code);
 
     List<BusinessOrderEntity> getbusinessOrdLn(String id);
+
+    List<ContractLEntity> queryBusinessContract(@Param("businessLine") String businessLine,@Param("organize") String organize,@Param("contractNumber") String contractNumber);
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java

@@ -50,6 +50,8 @@ public interface VoucherMapper extends BaseMapper<VoucherEntity> {
     VoucherEntity queryVoucherDetail(@Param("id") String id);
     BigDecimal queryVoucherByBusinessOrder(@Param("id") String id);
     BigDecimal queryVoucherByBusinessOrder1(@Param("id") String id); //查询订单利润
+    BigDecimal queryVoucherByBusinessOrder2(@Param("id") String id); //查询凭证采购额
+
 
     Map<String ,BigDecimal> queryAmountByBusinessOrder(@Param("id") String id);
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java

@@ -102,4 +102,8 @@ public interface BusinessOrderService extends IService<BusinessOrderEntity> {
     BigDecimal getSaleAmountSumInfo(String id);
 
     List<BusinessOrderEntity> getordLn(String id);
+
+
+    //根据业务线带出合同
+    List<ContractLEntity> queryBusinessContractInfo(String businessLine,String contractNumber);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java

@@ -77,7 +77,10 @@ public interface VoucherService extends IService<VoucherEntity> {
     VoucherEntity queryVoucherDetailInfo(String id);
     BigDecimal queryVoucherProductNetWeightInfo(String id);
     BigDecimal queryVoucherByBusinessOrderInfo(String id);
+
     BigDecimal queryVoucherByBusinessOrderInfo1(String id); //查询订单
+    BigDecimal queryVoucherByBusinessOrderInfo2(String id); //查询凭证采购额
+
     Map<String, BigDecimal> queryAmountByBusinessOrder(String id);
 
     void updateByVoucherCode(VoucherEntity voucherEntity);

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java

@@ -1493,6 +1493,17 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
         return businessOrderMapper.getbusinessOrdLn(id);
     }
 
+    @Override
+    public List<ContractLEntity> queryBusinessContractInfo(String businessLine, String contractNumber) {
+        UserInfo userInfo=userProvider.get();
+        OrganizeEntity organizeEntity =  organizeService.getInfo(userInfo.getOrganizeId());
+        List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+        String organize = JSON.toJSONString(organizeJsonId);
+        organize = organize.replace("[","");
+        organize = organize.replace("]","");
+        return businessOrderMapper.queryBusinessContract(businessLine,organize,contractNumber);
+    }
+
     public void getExcel(List<HashMap<String, Object>> list, String templateFilePath,String settlements,BigDecimal amount) throws Exception {
         String[] strings = settlements.split("_");
         settlements=strings[0];

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java

@@ -1456,6 +1456,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         return voucherMapper.queryVoucherByBusinessOrder1(id);
     }
 
+    @Override
+    public BigDecimal queryVoucherByBusinessOrderInfo2(String id) {
+        return voucherMapper.queryVoucherByBusinessOrder2(id);
+    }
+
     @Override
     public Map<String, BigDecimal> queryAmountByBusinessOrder(String id) {
         return voucherMapper.queryAmountByBusinessOrder(id);

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java

@@ -179,6 +179,13 @@ public class BusinessOrderController {
                 entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
             }
 
+            if (entity.getProfit().compareTo(BigDecimal.ZERO) <= 0){
+                BigDecimal purchaseAmount1 = voucherService.queryVoucherByBusinessOrderInfo2(entity.getId()); //采购订单总额
+                entity.setProfit(saleAmount.subtract(purchaseAmount1));//利润
+
+            }
+
+
         Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
         businessOrderMap.put("id", businessOrderMap.get("id"));
         //副表数据
@@ -1497,4 +1504,32 @@ public class BusinessOrderController {
         }
         return null;
     }
+
+
+
+    /**
+     * 列表
+     *
+     * @return
+     */
+    @Operation(summary = "获取业务线合同")
+    @GetMapping("/getBusinessContractList")
+    public ActionResult businessContractList(@RequestParam("businessLine") String businessLine,@RequestParam("contractNumber") String contractNumber  )throws IOException{
+        if (businessLine!=null && contractNumber!=null){
+            List<ContractLEntity> list= businessOrderService.queryBusinessContractInfo(businessLine,contractNumber);
+            for (ContractLEntity entity : list){
+                List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
+                entity.setProductByContractModelList(productByContractModelList);
+                QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
+                subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
+                List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
+                entity.setSubjectbasicEntityList(subjectbasicEntityList);
+            }
+            return ActionResult.success(list);
+        }else {
+            return ActionResult.success("没有合同或者业务线");
+        }
+
+    }
+
 }

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue

@@ -123,13 +123,31 @@
 
           <el-table-column prop="accountAmount" label="对账合计（含税）" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
+          <!-- <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
           </el-table-column>
           <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
           <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
           </el-table-column>
           <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
+          </el-table-column> -->
+
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="realName" label="创建用户" align="center">
+          </el-table-column>
+
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100" sortable>
+            <template slot-scope="scope">
+              {{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="realNameA" label="修改用户" align="center">
           </el-table-column>
 
           <el-table-column prop="flowState" label="状态" width="150" align="center">

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue

@@ -1614,6 +1614,39 @@ export default {
       if (this.dataForm.orderType == '3') {
         this.dataForm.contractId = undefined
       }
+      debugger
+      let businessLine = this.dataForm.businessLineId;
+      let contractNumber = this.dataForm.purchaseContractNo;
+      let data;
+      if (businessLine != "") {
+        // let businessLine = this.dataForm.businessLineId;
+        // let contractNumber = this.dataForm.purchaseContractNo;
+        let data = {
+          businessLine: this.dataForm.businessLineId,
+          contractNumber: this.dataForm.purchaseContractNo
+        }
+        request({
+          url: `/api/scm/BusinessOrder/getBusinessContractList`,
+          method: 'get',
+          data: data
+        }).then(res => {
+          var list = res.data;
+          this.dataForm.contractInfoList = list
+          this.dataForm.contractId = list[0].id
+          this.dataForm.contractName = list[0].contractName
+
+          console.log(this.dataForm.contractId);
+          console.log(this.dataForm.contractName);
+          console.log(this.dataForm.contractInfoList);
+        })
+      }
+      if (businessLine == "") {
+        this.dataForm.contractId = undefined
+        this.dataForm.contractName = undefined
+        this.dataForm.contractInfoList = undefined
+
+      }
+
     },
     //根据输入采购单价计算总价和不含税单价、不含税总价
     priceCount(row) {