回款优化

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -102,6 +102,17 @@ public class CollectionController {
         return ActionResult.success(result);
     }
 
+    /**
+     * 合同信息
+     *
+     * @param code
+     * @return
+     */
+    @GetMapping("/contractShow")
+    public ActionResult contractShow(@Param("code") String code) {
+        List<ContractFileEntity> contractList = collectionService.queryContractInfo(code);
+        return ActionResult.success(contractList);
+    }
 
     /**
      * 选完合同，默认显示订单信息
@@ -204,6 +215,7 @@ public class CollectionController {
 //                    saleordercetEntity.setStatus("3");
                     saleorderitemService.updateById(saleordercetEntity);
                     collectionEntity.setStatus("2");
+                    collectionEntity.setBusinessDate(new Date());
                     collectionService.updateById(collectionEntity);
                     return ActionResult.success("认款成功");
                 }
@@ -498,7 +510,7 @@ public class CollectionController {
             if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
                 jg_collection_item0Model.setPrice(String.valueOf(saleorderitemEntity.getPrice()));
                 jg_collection_item0Model.setAmountCollected(String.valueOf(saleorderitemEntity.getAmountCollected()));
-                jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
+//                jg_collection_item0Model.setContractId(saleorderitemEntity.getContractId());
                 jg_collection_item0Model.setSalesorderId(saleorderitemEntity.getDocumentNo());
                 jg_collection_item0Model.setNum(String.valueOf(saleorderitemEntity.getNum()));
                 jg_collection_item0Model.setAdvanceAmount(String.valueOf(saleorderitemEntity.getAdvanceAmount()));

SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.collection.entity.CollectionEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.collection.model.collection.CollectionPagination;
+import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
@@ -26,5 +27,7 @@ public interface CollectionMapper extends BaseMapper<CollectionEntity> {
 
     List<SaleorderitemEntity> querySaleOrder(String contractId);
 
+    List<ContractFileEntity> queryContract(String code);
+
     IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination);
 }

SC-boot/linkage-scm/src/main/java/jnpf/collection/service/CollectionService.java

@@ -5,6 +5,7 @@ import jnpf.collection.service.Collection_item0Service;
 import jnpf.collection.entity.CollectionEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.collection.model.collection.CollectionPagination;
+import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 
@@ -42,5 +43,7 @@ public interface CollectionService extends IService<CollectionEntity> {
 
      List<SaleorderitemEntity> querySaleOrderInfo(String contractId);
 
+     List<ContractFileEntity> queryContractInfo(String code);
+
     //列表子表数据方法
 }

SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java

@@ -4,6 +4,7 @@ import jnpf.collection.entity.*;
 import jnpf.collection.mapper.CollectionMapper;
 import jnpf.collection.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
 import jnpf.saleorder.entity.SaleorderitemEntity;
@@ -288,6 +289,11 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         return collectionMapper.querySaleOrder(contractId) ;
     }
 
+    @Override
+    public List<ContractFileEntity> queryContractInfo(String code) {
+        return collectionMapper.queryContract(code);
+    }
+
     //列表子表数据方法
 
 

SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml

@@ -41,4 +41,13 @@
         and delete_mark = '0'
     </select>
 
+    <select id="queryContract" resultType="jnpf.contractfile.entity.ContractFileEntity">
+        select * from jg_contract
+        where contract_type = '1'
+        and status = '1'
+        <if test="code!=null and code!=''">
+            and code = #{code}
+        </if>
+    </select>
+
 </mapper>